diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
commit | c371f49d9aaf2c9eca90329954fe217efb5cf3f6 (patch) | |
tree | 142b9cb20d8b963f0cfd8a8fd4ee6437a47dafc4 /source/gameengine/GameLogic | |
parent | b55e996874c8b9a12b4a2a50f9d1993b5f921c57 (diff) | |
parent | 7301f33b26ccae263d0bfdde5f82d98a70790fd5 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r-- | source/gameengine/GameLogic/SCA_IScene.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h index b641efc6ee1..79d922a998e 100644 --- a/source/gameengine/GameLogic/SCA_IScene.h +++ b/source/gameengine/GameLogic/SCA_IScene.h @@ -55,7 +55,7 @@ public: //virtual void DelayedReleaseObject(class CValue* gameobj)=0; virtual void ReplaceMesh(class CValue* gameobj, - void* meshobj)=0; + void* meshobj, bool use_gfx, bool use_phys)=0; std::vector<SCA_DebugProp*>& GetDebugProperties(); void AddDebugProperty(class CValue* debugprop, const STR_String &name); |