Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPorteries Tristan <republicthunderbolt9@gmail.com>2015-03-15 12:36:55 +0300
committerJorge Bernal <jbernalmartinez@gmail.com>2015-03-15 12:50:59 +0300
commit176ecd9c9ca9fd0d2b28b4690e005f79177ab509 (patch)
treeba0e6ec6c90939f5f5c916ab9ba799f76f15b70b /source/gameengine/GameLogic
parent3824e0f1243798fc580f18c7948a5fc473baa58c (diff)
BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and
overlay scene GetGameObjectType is overwritten in KX_FontObject to differentiate a font object into AddNodeReplicaObject function. Now, in this function, we add fonts in the appropriate list. Reviewers: campbellbarton, moguri, dfelinto, lordloki Reviewed By: lordloki Subscribers: lordloki Projects: #game_logic, #game_engine Differential Revision: https://developer.blender.org/D1130
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r--source/gameengine/GameLogic/SCA_IObject.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h
index 3ffe128c3b3..d5972a0a807 100644
--- a/source/gameengine/GameLogic/SCA_IObject.h
+++ b/source/gameengine/GameLogic/SCA_IObject.h
@@ -221,6 +221,7 @@ public:
OBJ_ARMATURE=0,
OBJ_CAMERA=1,
OBJ_LIGHT=2,
+ OBJ_FONT=3,
} ObjectTypes;
};