History

Do not store physics engine pointer in PickScriptingInterface

sabrina-shanman committed 8 years ago

Commit a460cfa1 parent c6b24493 files · +2 −10Browse files

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

Unified · Split

interface/src/raypick/PickScriptingInterface.cpp+2−1
@@ -11,6 +11,7 @@ · 10 unmodified lines
11#include <QVariant>11#include <QVariant>
12#include "GLMHelpers.h"12#include "GLMHelpers.h"
13 13
14#include "Application.h"
14#include <PickManager.h>15#include <PickManager.h>
15 16
16#include "StaticRayPick.h"17#include "StaticRayPick.h"
@@ -174,7 +175,7 @@ unsigned int PickScriptingInterface::createCollisionPick(const QVariant& propert · 157 unmodified lines
174 175
175 CollisionRegion collisionRegion(propMap);176 CollisionRegion collisionRegion(propMap);
176 177
177 return DependencyManager::get<PickManager>()->addPick(PickQuery::Collision, std::make_shared<CollisionPick>(filter, maxDistance, enabled, collisionRegion, _physicsEngine));178 return DependencyManager::get<PickManager>()->addPick(PickQuery::Collision, std::make_shared<CollisionPick>(filter, maxDistance, enabled, collisionRegion, qApp->getPhysicsEngine()));
178}179}
179 180
180void PickScriptingInterface::enablePick(unsigned int uid) {181void PickScriptingInterface::enablePick(unsigned int uid) {