aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-23 23:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #1302 Fixed undo/redo bug (moving primitives).

Browse source
This commit is contained in:
dnk-88 2012-04-23 19:20:09 +03:00
parent 3c09ce3ee8
commit c2bd4fabd6
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.cpp
View file

@ -96,6 +96,7 @@ bool PixmapDatabase::loadPixmaps(const QString &zonePath, NLLIGO::CZoneBank &zon
painter.end(); painter.end();
delete pixmap; delete pixmap;
m_pixmapMap.insert(zonePixmapName, emptyPixmap); m_pixmapMap.insert(zonePixmapName, emptyPixmap);
nlwarning(QString("not found " + zonePath + zonePixmapName + ".png").toStdString().c_str());
} }
// All pixmaps must be have same size // All pixmaps must be have same size
else if (pixmap->width() != sizeX * m_textureSize) else if (pixmap->width() != sizeX * m_textureSize)

2
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.cpp
View file

@ -150,7 +150,7 @@ void PropertyEditorWidget::updateSelection(Node *node)
prop = addConstStringArrayProperty(ligoProperty, parameter, primitive); prop = addConstStringArrayProperty(ligoProperty, parameter, primitive);
else else
// hmn? // hmn?
prop = addBoolProperty(parameter, primitive); prop = addBoolProperty(ligoProperty, parameter, primitive);
// Default value ? // Default value ?
if ((ligoProperty == NULL) || (ligoProperty->Default)) if ((ligoProperty == NULL) || (ligoProperty->Default))

4
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_scene.cpp
View file

@ -227,6 +227,7 @@ void WorldEditorScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
} }
m_editedSelectedItems = false; m_editedSelectedItems = false;
m_offset = QPointF(0, 0);
m_angle = 0; m_angle = 0;
m_scaleFactor = QPointF(1.0, 1.0); m_scaleFactor = QPointF(1.0, 1.0);
@ -516,7 +517,8 @@ void WorldEditorScene::checkUndoPointsMode()
void WorldEditorScene::updateWorldItemsMove(QGraphicsSceneMouseEvent *mouseEvent) void WorldEditorScene::updateWorldItemsMove(QGraphicsSceneMouseEvent *mouseEvent)
{ {
QPointF offset(mouseEvent->scenePos() - mouseEvent->lastScenePos()); QPointF offset = mouseEvent->scenePos() - mouseEvent->lastScenePos();
m_offset += offset;
if (m_pointsMode) if (m_pointsMode)
Q_FOREACH(QGraphicsItem *item, m_selectedPoints) Q_FOREACH(QGraphicsItem *item, m_selectedPoints)
{ {