diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:27:25 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:27:25 +0400 |
| commit | 5a3c6ccadb8925d6e2b1da2b2861de35b33f939f (patch) | |
| tree | ee9b2a9e66c60f10f963399f198a9268b2cc5bc6 /source/gameengine/Converter/KX_ConvertActuators.cpp | |
| parent | 4393df93202198b5eaaff438e18060c66b98928d (diff) | |
| parent | 59dbd53e72ae25edf247e49ea1e291af277fecc4 (diff) | |
Merging r39847 through r39930 from trunk into vgroup_modifiers.
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertActuators.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index a84a1419d0d..8fc224fba6f 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -942,7 +942,7 @@ void BL_ConvertActuators(char* maggiename, case ACT_2DFILTER: { bTwoDFilterActuator *_2dfilter = (bTwoDFilterActuator*) bact->data; - SCA_2DFilterActuator *tmp = NULL; + SCA_2DFilterActuator *tmp = NULL; RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode; switch(_2dfilter->type) |