From 646575f8d91af059da8e50d1b61c7ad16dc65b2e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 13 Dec 2009 11:49:17 +0000 Subject: [PATCH] clear loc/size/rot wasnt updating child transformations, also removed some warnings --- .../blender/editors/object/object_transform.c | 11 ++++++++++- .../Converter/KX_BlenderSceneConverter.h | 18 +++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 69a2315fd5d..cd2361a1cc0 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -105,8 +105,11 @@ static int object_location_clear_exec(bContext *C, wmOperator *op) } CTX_DATA_END; + /* this is needed so children are also updated */ + DAG_ids_flush_update(0); + WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL); - + return OPERATOR_FINISHED; } @@ -241,6 +244,9 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) } CTX_DATA_END; + /* this is needed so children are also updated */ + DAG_ids_flush_update(0); + WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL); return OPERATOR_FINISHED; @@ -299,6 +305,9 @@ static int object_scale_clear_exec(bContext *C, wmOperator *op) } CTX_DATA_END; + /* this is needed so children are also updated */ + DAG_ids_flush_update(0); + WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL); return OPERATOR_FINISHED; diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index c8009eb9437..ab654e97513 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -156,17 +156,17 @@ public: printf("BGE STATS!\n"); printf("\nAssets...\n"); - printf("\t m_worldinfos: %d\n", m_worldinfos.size()); - printf("\t m_polymaterials: %d\n", m_polymaterials.size()); - printf("\t m_meshobjects: %d\n", m_meshobjects.size()); - printf("\t m_materials: %d\n", m_materials.size()); + printf("\t m_worldinfos: %d\n", (int)m_worldinfos.size()); + printf("\t m_polymaterials: %d\n", (int)m_polymaterials.size()); + printf("\t m_meshobjects: %d\n", (int)m_meshobjects.size()); + printf("\t m_materials: %d\n", (int)m_materials.size()); printf("\nMappings...\n"); - printf("\t m_map_blender_to_gameobject: %d\n", m_map_blender_to_gameobject.size()); - printf("\t m_map_mesh_to_gamemesh: %d\n", m_map_mesh_to_gamemesh.size()); - printf("\t m_map_blender_to_gameactuator: %d\n", m_map_blender_to_gameactuator.size()); - printf("\t m_map_blender_to_gamecontroller: %d\n", m_map_blender_to_gamecontroller.size()); - printf("\t m_map_blender_to_gameAdtList: %d\n", m_map_blender_to_gameAdtList.size()); + printf("\t m_map_blender_to_gameobject: %d\n", (int)m_map_blender_to_gameobject.size()); + printf("\t m_map_mesh_to_gamemesh: %d\n", (int)m_map_mesh_to_gamemesh.size()); + printf("\t m_map_blender_to_gameactuator: %d\n", (int)m_map_blender_to_gameactuator.size()); + printf("\t m_map_blender_to_gamecontroller: %d\n", (int)m_map_blender_to_gamecontroller.size()); + printf("\t m_map_blender_to_gameAdtList: %d\n", (int)m_map_blender_to_gameAdtList.size()); #ifdef WITH_CXX_GUARDEDALLOC MEM_printmemlist_pydict();