History

remove legacy shapes

Andrew Meadows committed 11 years ago

Commit 0a5ada31 parent ef5e7e936 files · +15 −4796Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 36 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−3
@@ -20,7 +20,6 @@ · 19 unmodified lines
20#include <AudioConstants.h>20#include <AudioConstants.h>
21#include <AudioEffectOptions.h>21#include <AudioEffectOptions.h>
22#include <AvatarData.h>22#include <AvatarData.h>
23#include <CollisionInfo.h>
24#include <EntityScriptingInterface.h>23#include <EntityScriptingInterface.h>
25#include <NetworkAccessManager.h>24#include <NetworkAccessManager.h>
26#include <NodeList.h>25#include <NodeList.h>
@@ -366,8 +365,6 @@ void ScriptEngine::init() { · 339 unmodified lines
366 365
367 // constants366 // constants
368 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));367 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));
369 globalObject().setProperty("COLLISION_GROUP_ENVIRONMENT", newVariant(QVariant(COLLISION_GROUP_ENVIRONMENT)));
370 globalObject().setProperty("COLLISION_GROUP_AVATARS", newVariant(QVariant(COLLISION_GROUP_AVATARS)));
371}368}
372 369
373QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {370QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {