Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code

sabrina-shanman committed 8 years ago

Commit 836f8101 parent 714cfc59 files · +61 −108Browse files

Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 9 files). Show all

Unified · Split

@@ -383,6 +383,10 @@ std::shared_ptr<TransformNode> PickScriptingInterface::createTransformNode(const · 382 unmodified lines
383	383	if (propMap["parentJointIndex"].isValid()) {
384	384	parentJointIndex = propMap["parentJointIndex"].toInt();
385	385	}
	386	+ glm::vec3 baseScale = glm::vec3(1);
	387	+ if (propMap["baseScale"].isValid()) {
	388	+ baseScale = vec3FromVariant(propMap["baseScale"]);
	389	+ }
386	390	auto sharedNestablePointer = nestablePointer.lock();
387	391	if (success && sharedNestablePointer) {
388	392	NestableType nestableType = sharedNestablePointer->getNestableType();