comparison: src/ldObject.cpp
src/ldObject.cpp
- changeset 981
- 5d5d84ab2c48
- parent 979
- 880d3fe9ac7c
- child 983
- 05ba93066194
equal
deleted
inserted
replaced
| 980:4a95c6b06ebe | 981:5d5d84ab2c48 |
|---|---|
| 302 if (document() != null) | 302 if (document() != null) |
| 303 document()->forgetObject (this); | 303 document()->forgetObject (this); |
| 304 | 304 |
| 305 // Delete the GL lists | 305 // Delete the GL lists |
| 306 if (g_win != null) | 306 if (g_win != null) |
| 307 g_win->R()->forgetObject (this); | 307 g_win->renderer()->forgetObject (this); |
| 308 | 308 |
| 309 // Remove this object from the list of LDObjects | 309 // Remove this object from the list of LDObjects |
| 310 g_allObjects.erase (g_allObjects.find (id())); | 310 g_allObjects.erase (g_allObjects.find (id())); |
| 311 | 311 |
| 312 m_isDestroyed = true; | 312 m_isDestroyed = true; |
| 473 removeDuplicates (objsToCompile); | 473 removeDuplicates (objsToCompile); |
| 474 | 474 |
| 475 // The objects need to be recompiled, otherwise their pick lists are left with | 475 // The objects need to be recompiled, otherwise their pick lists are left with |
| 476 // the wrong index colors which messes up selection. | 476 // the wrong index colors which messes up selection. |
| 477 for (LDObject* obj : objsToCompile) | 477 for (LDObject* obj : objsToCompile) |
| 478 g_win->R()->compileObject (obj); | 478 g_win->renderer()->compileObject (obj); |
| 479 } | 479 } |
| 480 | 480 |
| 481 // ============================================================================= | 481 // ============================================================================= |
| 482 // | 482 // |
| 483 QString LDObject::typeName (LDObjectType type) | 483 QString LDObject::typeName (LDObjectType type) |
| 784 QString after = obj->asText(); | 784 QString after = obj->asText(); |
| 785 | 785 |
| 786 if (before != after) | 786 if (before != after) |
| 787 { | 787 { |
| 788 obj->document()->addToHistory (new EditHistory (idx, before, after)); | 788 obj->document()->addToHistory (new EditHistory (idx, before, after)); |
| 789 g_win->R()->compileObject (obj); | 789 g_win->renderer()->compileObject (obj); |
| 790 g_win->currentDocument()->redoVertices(); | 790 g_win->currentDocument()->redoVertices(); |
| 791 } | 791 } |
| 792 } | 792 } |
| 793 else | 793 else |
| 794 { | 794 { |
