comparison: src/linetypes/modelobject.cpp
src/linetypes/modelobject.cpp
- changeset 1367
- 0aab8d972cf6
- parent 1326
- 69a90bd2dba2
- child 1391
- 5fa4bf1fc781
equal
deleted
inserted
replaced
| 1365:3f917410e977 | 1367:0aab8d972cf6 |
|---|---|
| 162 Winding parentWinding, | 162 Winding parentWinding, |
| 163 Model& model, | 163 Model& model, |
| 164 bool deep, | 164 bool deep, |
| 165 bool render | 165 bool render |
| 166 ) { | 166 ) { |
| 167 Model inlined {context}; | 167 LDDocument* subfile = this->fileInfo(context); |
| 168 fileInfo(context)->inlineContents(inlined, deep, render); | 168 |
| 169 | 169 if (subfile != nullptr) |
| 170 // Transform the objects | 170 { |
| 171 for (LDObject* object : inlined) | 171 Model inlined {context}; |
| 172 { | 172 subfile->inlineContents(inlined, deep, render); |
| 173 if (::shouldInvert(this, parentWinding, context)) | 173 |
| 174 ::invert(object, context); | 174 // Transform the objects |
| 175 | 175 for (LDObject* object : inlined) |
| 176 TransformObject(object, transformationMatrix(), position(), color()); | 176 { |
| 177 } | 177 if (::shouldInvert(this, parentWinding, context)) |
| 178 | 178 ::invert(object, context); |
| 179 model.merge(inlined); | 179 |
| 180 TransformObject(object, transformationMatrix(), position(), color()); | |
| 181 } | |
| 182 | |
| 183 model.merge(inlined); | |
| 184 } | |
| 180 } | 185 } |
| 181 | 186 |
| 182 // ============================================================================= | 187 // ============================================================================= |
| 183 // | 188 // |
| 184 LDPolygon* LDObject::getPolygon() | 189 LDPolygon* LDObject::getPolygon() |
