History

resolve conflicts on merge with upstream master

Stephen Birarda committed 11 years ago

Commit 05297882 parents e6f559f 5be8583262 files · +12120 −6415Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 262 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+1−0
@@ -118,6 +118,7 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit · 117 unmodified lines
118118 results.setSittingPoints(geometry->sittingPoints);
119119 Extents meshExtents = geometry->getUnscaledMeshExtents();
120120 results.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
121+ results.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
121122 }
122123 }
123124