diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2015-03-16 20:46:40 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2015-03-16 20:46:40 +0300 |
| commit | 9ed5a1073ef9db3761ab5ddc30f34955096f9ea8 (patch) | |
| tree | dcc5cfa5801bf53767fc5a5053025c1c95fe82fe /source/gameengine/GameLogic | |
| parent | 77bc623bc4b1b1d6389eb749468348c13ed19ce8 (diff) | |
fix D1130 renamed the enum OBJ_FONT to OBJ_TEXT to avoid naming conflicts in Windows
Diffstat (limited to 'source/gameengine/GameLogic')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_IObject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index d5972a0a807..a695fd4e7be 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -221,7 +221,7 @@ public: OBJ_ARMATURE=0, OBJ_CAMERA=1, OBJ_LIGHT=2, - OBJ_FONT=3, + OBJ_TEXT=4 } ObjectTypes; }; |