History

Merge pull request #4366 from ZappoMan/removeMetavoxels

remove metavoxels

samcake committed 11 years ago

Commit 6b1f42d2 parents 9649ed9 5c3c94a66 files · +30 −25269Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−2
@@ -20,7 +20,6 @@ · 19 unmodified lines
2020 #include <AudioConstants.h>
2121 #include <AudioEffectOptions.h>
2222 #include <AvatarData.h>
23−#include <Bitstream.h>
2423 #include <CollisionInfo.h>
2524 #include <EntityScriptingInterface.h>
2625 #include <NetworkAccessManager.h>
@@ -323,7 +322,6 @@ void ScriptEngine::init() { · 296 unmodified lines
323322 registerAnimationTypes(this);
324323 registerAvatarTypes(this);
325324 registerAudioMetaTypes(this);
326− Bitstream::registerTypes(this);
327325
328326 qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);
329327 qScriptRegisterMetaType(this, EntityItemIDtoScriptValue, EntityItemIDfromScriptValue);