History

merge with pointers branch

SamGondelman committed 9 years ago

Commit f970eb22 parents 7d420f5 544c54b46 files · +1117 −604Browse files

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

Unified · Split

interface/src/raypick/PickScriptingInterface.cpp+7−2
@@ -94,10 +94,15 @@ void PickScriptingInterface::removePick(unsigned int uid) { · 93 unmodified lines
9494 }
9595
9696 QVariantMap PickScriptingInterface::getPrevPickResult(unsigned int uid) {
97− return DependencyManager::get<PickManager>()->getPrevPickResult(uid);
97+ QVariantMap result;
98+ auto pickResult = DependencyManager::get<PickManager>()->getPrevPickResult(uid);
99+ if (pickResult) {
100+ result = pickResult->toVariantMap();
101+ }
102+ return result;
98103 }
99104
100−void PickScriptingInterface::setPrecisionPicking(unsigned int uid, const bool precisionPicking) {
105+void PickScriptingInterface::setPrecisionPicking(unsigned int uid, bool precisionPicking) {
101106 DependencyManager::get<PickManager>()->setPrecisionPicking(uid, precisionPicking);
102107 }
103108