fix D1130 renamed the enum OBJ_FONT to OBJ_TEXT to avoid naming conflicts in Windows
This commit is contained in:
parent
77bc623bc4
commit
9ed5a1073e
@ -221,7 +221,7 @@ public:
|
||||
OBJ_ARMATURE=0,
|
||||
OBJ_CAMERA=1,
|
||||
OBJ_LIGHT=2,
|
||||
OBJ_FONT=3,
|
||||
OBJ_TEXT=4
|
||||
} ObjectTypes;
|
||||
|
||||
};
|
||||
|
@ -54,7 +54,7 @@ public:
|
||||
*/
|
||||
virtual CValue* GetReplica();
|
||||
virtual void ProcessReplica();
|
||||
virtual int GetGameObjectType() { return OBJ_FONT; }
|
||||
virtual int GetGameObjectType() { return OBJ_TEXT; }
|
||||
|
||||
protected:
|
||||
std::vector<STR_String> m_text;
|
||||
|
@ -532,7 +532,7 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal
|
||||
m_objectlist->Add(newobj->AddRef());
|
||||
if (newobj->GetGameObjectType()==SCA_IObject::OBJ_LIGHT)
|
||||
m_lightlist->Add(newobj->AddRef());
|
||||
else if (newobj->GetGameObjectType()==SCA_IObject::OBJ_FONT)
|
||||
else if (newobj->GetGameObjectType()==SCA_IObject::OBJ_TEXT)
|
||||
AddFont((KX_FontObject*)newobj);
|
||||
newobj->AddMeshUser();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user