comparison: src/linetypes/modelobject.cpp
src/linetypes/modelobject.cpp
- changeset 1262
- f6b253c17643
- parent 1261
- 5d2c9d36da9d
- child 1263
- 0256edecda54
equal
deleted
inserted
replaced
| 1261:5d2c9d36da9d | 1262:f6b253c17643 |
|---|---|
| 185 obj->setColor (parentcolor); | 185 obj->setColor (parentcolor); |
| 186 } | 186 } |
| 187 | 187 |
| 188 // ============================================================================= | 188 // ============================================================================= |
| 189 // ----------------------------------------------------------------------------- | 189 // ----------------------------------------------------------------------------- |
| 190 void LDSubfileReference::inlineContents(Model& model, bool deep, bool render) | 190 void LDSubfileReference::inlineContents(DocumentManager* context, Model& model, bool deep, bool render) |
| 191 { | 191 { |
| 192 Model inlined {this->model()->documentManager()}; | 192 Model inlined {context}; |
| 193 fileInfo()->inlineContents(inlined, deep, render); | 193 fileInfo()->inlineContents(inlined, deep, render); |
| 194 | 194 |
| 195 // Transform the objects | 195 // Transform the objects |
| 196 for (LDObject* object : inlined) | 196 for (LDObject* object : inlined) |
| 197 TransformObject(object, transformationMatrix(), position(), color()); | 197 TransformObject(object, transformationMatrix(), position(), color()); |
