diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-08 22:32:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-08 22:32:42 +0400 |
| commit | f43c66f384d6dca227a7081bbe7e4f763debe7fd (patch) | |
| tree | ac15e2727efd7ebd68419c8378805f115a81b7c6 /source/gameengine/Converter/BL_BlenderDataConversion.cpp | |
| parent | 178be13f65aa7a21e877501805bfab047c9d004c (diff) | |
| parent | bbf1ce2762651f0d3f3a9c302c3575c68ca21ca7 (diff) | |
svn merge -r15478:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Diffstat (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 93d59a03e01..f23defb16a4 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2343,7 +2343,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, { KX_GameObject* gameobj = static_cast<KX_GameObject*>(logicbrick_conversionlist->GetValue(i)); struct Object* blenderobj = converter->FindBlenderObject(gameobj); - gameobj->SetState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state); + gameobj->SetInitState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state); + gameobj->ResetState(); } #endif //CONVERT_LOGIC |