History

Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic

Seth Alves committed 11 years ago

Commit bc656162 parents 2ca592d ad7293d91 files · +3861 −880Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+9−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
1515 #include "EntityTree.h"
1616 #include "LightEntityItem.h"
1717 #include "ModelEntityItem.h"
18+#include "ZoneEntityItem.h"
1819
1920
2021 EntityScriptingInterface::EntityScriptingInterface() :
@@ -306,6 +307,14 @@ bool EntityScriptingInterface::getLightsArePickable() const { · 285 unmodified lines
306307 return LightEntityItem::getLightsArePickable();
307308 }
308309
310+void EntityScriptingInterface::setZonesArePickable(bool value) {
311+ ZoneEntityItem::setZonesArePickable(value);
312+}
313+
314+bool EntityScriptingInterface::getZonesArePickable() const {
315+ return ZoneEntityItem::getZonesArePickable();
316+}
317+
309318 void EntityScriptingInterface::setSendPhysicsUpdates(bool value) {
310319 EntityItem::setSendPhysicsUpdates(value);
311320 }