diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-06-22 22:12:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-06-22 22:12:46 +0400 |
| commit | deabd2a280598d5bfb231ebd93a8b01f9420b32e (patch) | |
| tree | 516b4de34745b7dea2aebe2882d7395e4174a92b /source/gameengine/Converter/KX_ConvertControllers.cpp | |
| parent | 3afb8c19a3e31cbe61fc216bd4913178fa3430c3 (diff) | |
svn merge -r15265:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertControllers.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertControllers.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp index a26cfa95b6d..179dd9f8478 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.cpp +++ b/source/gameengine/Converter/KX_ConvertControllers.cpp @@ -161,6 +161,7 @@ void BL_ConvertControllers( if (gamecontroller) { gamecontroller->SetExecutePriority(executePriority++); + gamecontroller->SetState(bcontr->state_mask); STR_String uniquename = bcontr->name; uniquename += "#CONTR#"; uniqueint++; |