diff options
36 files changed, 3 insertions, 52 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index c59044d1fce..8ba6784f1de 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -64,7 +64,6 @@ #include "BKE_multires.h" #include "BKE_armature.h" #include "BKE_particle.h" -#include "BKE_editmesh.h" #include "BKE_bvhutils.h" #include "BKE_deform.h" #include "BKE_global.h" /* For debug flag, DM_update_tessface_data() func. */ diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 04bd8d3aa2d..b40e04d29d3 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -39,7 +39,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_edgehash.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_scanfill.h" diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 0f6d4144b46..acafa762853 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -38,7 +38,6 @@ #include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "BLI_utildefines.h" #include "BLI_linklist.h" #include "BKE_cdderivedmesh.h" diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index e3081b9e670..393632117bc 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -44,7 +44,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_memarena.h" #include "BLI_rand.h" @@ -57,7 +56,6 @@ #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_DerivedMesh.h" #ifdef WITH_BULLET #include "Bullet-C-Api.h" #endif diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index c14e8dd5e16..1397a7d4824 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -81,7 +81,6 @@ #include "BKE_idprop.h" #include "BKE_mesh.h" #include "BKE_shrinkwrap.h" -#include "BKE_mesh.h" #include "BKE_editmesh.h" #include "BKE_tracking.h" #include "BKE_movieclip.h" diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index e5565e8c6bd..fffd11505a5 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -49,7 +49,6 @@ #include "BLI_path_util.h" #include "BLI_math.h" #include "BLI_mempool.h" -#include "BLI_utildefines.h" #include "BLI_alloca.h" #include "BLF_translation.h" diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 93833f5c5ae..9dbaaa939ca 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -61,7 +61,6 @@ #include "BKE_editmesh.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_deform.h" #include "BKE_scene.h" diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 27a8730fe03..d6225560e32 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -41,7 +41,6 @@ #include "DNA_lamp_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" -#include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_texture_types.h" #include "DNA_world_types.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index af8cf62484d..0104efb4892 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -45,7 +45,6 @@ #include "BKE_global.h" #include "BKE_icons.h" #include "BKE_library.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_world.h" diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f41baf5553a..cfc5092f59a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -103,7 +103,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_endian_switch.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 129e9800ee4..854e9d8cec9 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -145,7 +145,6 @@ #include "BLI_blenlib.h" #include "BLI_linklist.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_mempool.h" #include "BKE_action.h" diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 990af78c00d..edbe17065f1 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -44,8 +44,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_screen.h" - #include "BIF_gl.h" #include "WM_api.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index 3ada57a4e30..288e658e727 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -39,7 +39,6 @@ #include "BLI_math.h" #include "BLI_string.h" #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_rect.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c index 4b90fa5839f..bedd576a65e 100644 --- a/source/blender/editors/space_clip/clip_utils.c +++ b/source/blender/editors/space_clip/clip_utils.c @@ -54,8 +54,6 @@ #include "ED_screen.h" #include "ED_clip.h" -#include "UI_interface.h" - #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 582e6861974..56036506633 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -49,12 +49,9 @@ #include "BLF_api.h" #include "BLF_translation.h" -#include "NOD_texture.h" - #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BLF_translation.h" #include "MEM_guardedalloc.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 50904ed912c..c93dd7e9e0b 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -44,8 +44,6 @@ #include "ED_space_api.h" #include "ED_image.h" -#include "UI_view2d.h" - #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index b8bb196b9c6..ae6e09def57 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -49,7 +49,6 @@ #include "ED_node.h" #include "ED_render.h" #include "ED_screen.h" -#include "ED_node.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index fcd8acd391d..156df05c03d 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -57,7 +57,6 @@ #include "BKE_main.h" #include "BKE_sequencer.h" #include "BKE_movieclip.h" -#include "BKE_sequencer.h" #include "BKE_mask.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c index c8fd6e4b6ea..9850c7c3493 100644 --- a/source/blender/editors/space_sequencer/sequencer_modifier.c +++ b/source/blender/editors/space_sequencer/sequencer_modifier.c @@ -45,7 +45,6 @@ #include "BKE_main.h" #include "BKE_sequencer.h" #include "BKE_movieclip.h" -#include "BKE_sequencer.h" #include "BKE_mask.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 681d5ca22fb..04b2b4c5c55 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -36,7 +36,6 @@ #include "BLI_blenlib.h" #include "BLI_bitmap.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index c0a5e505f38..75b124803ab 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -48,8 +48,8 @@ #include "BLI_math.h" #include "BLI_edgehash.h" #include "BLI_uvproject.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_scanfill.h" #include "BKE_cdderivedmesh.h" #include "BKE_subsurf.h" @@ -63,11 +63,6 @@ #include "BKE_scene.h" #include "BKE_editmesh.h" -#include "BLI_math.h" -#include "BLI_edgehash.h" -#include "BLI_scanfill.h" -#include "BLI_uvproject.h" - #include "PIL_time.h" #include "ED_image.h" diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index e45222706d7..3eaf42b1b22 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -34,7 +34,6 @@ #include "BLI_endian_switch.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BLI_path_util.h" #include "BLI_fileops.h" #include "BLI_math_base.h" diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 1710f9e81af..d95c394b60f 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -53,7 +53,6 @@ #include <stdio.h> #include "MEM_guardedalloc.h" -#include "DNA_sdna_types.h" #include "../blenlib/BLI_sys_types.h" // for intptr_t support diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index fedfdd42b55..4baca862682 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -39,7 +39,6 @@ #include "DNA_genfile.h" #include "DNA_sdna_types.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_ghash.h" diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index 0c58d5cab6b..aee9c054b6f 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -33,7 +33,6 @@ #include "BLI_utildefines.h" -#include "RNA_define.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index e96ddcde161..e7eb5d64b9d 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -40,7 +40,6 @@ #include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_object_fluidsim.h" #include "BLI_blenlib.h" diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index fddcc249f99..b30658fa2be 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -35,7 +35,6 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLI_string.h" diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index a547604cdd6..23486a8ab91 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -377,6 +377,8 @@ void BPY_python_end(void) BPY_atexit_unregister(); /* without this we get recursive calls to WM_exit */ Py_Finalize(); + + (void)gilstate; #else PyGILState_Release(gilstate); #endif diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index bcde98aea8f..f511ed81ea6 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -120,7 +120,6 @@ #include "texture.h" #include "volume_precache.h" #include "sss.h" -#include "strand.h" #include "zbuf.h" #include "sunsky.h" diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 0d9f4666810..2718d2090cd 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -65,7 +65,6 @@ #include "BKE_scene.h" #include "BKE_library.h" -#include "BKE_image.h" #include "BKE_texture.h" #include "BKE_key.h" #include "BKE_ipo.h" diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index c58746a22c1..c0c28d15ad3 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -35,7 +35,6 @@ #include "KX_Scene.h" #include "KX_GameObject.h" -#include "KX_BlenderSceneConverter.h" #include "KX_IpoConvert.h" #include "RAS_MeshObject.h" #include "KX_PhysicsEngineEnums.h" @@ -57,12 +56,10 @@ #include "CcdPhysicsEnvironment.h" #endif -#include "KX_BlenderSceneConverter.h" #include "KX_LibLoadStatus.h" #include "KX_BlenderScalarInterpolator.h" #include "BL_BlenderDataConversion.h" #include "BlenderWorldInfo.h" -#include "KX_Scene.h" /* This little block needed for linking to Blender... */ #ifdef WIN32 @@ -98,9 +95,7 @@ extern "C" /* Only for dynamic loading and merging */ #include "RAS_BucketManager.h" // XXX cant stay #include "KX_BlenderSceneConverter.h" -#include "BL_BlenderDataConversion.h" #include "KX_MeshProxy.h" -#include "RAS_MeshObject.h" extern "C" { #include "PIL_time.h" #include "BKE_context.h" @@ -254,7 +249,6 @@ Scene *KX_BlenderSceneConverter::GetBlenderSceneForName(const STR_String& name) return (Scene*)m_maggie->scene.first; } -#include "KX_PythonInit.h" #ifdef WITH_BULLET diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index 860dd5c06fb..2e2ebda47e2 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -84,7 +84,6 @@ #include "PHY_IPhysicsEnvironment.h" #include "KX_KetsjiEngine.h" -#include "KX_BlenderSceneConverter.h" #include "BL_BlenderDataConversion.h" void BL_ConvertSensors(struct Object* blenderobject, diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 16513a97d60..ff5522ee7d2 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -49,7 +49,6 @@ #include "CTR_HashedPtr.h" #include "KX_PhysicsEngineEnums.h" -#include "PHY_Pro.h" #include "KX_MotionState.h" // bridge between motionstate and scenegraph node diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 8b7e6667fae..b6844a6900f 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -57,7 +57,6 @@ typedef unsigned long uint_ptr; #include "SG_Controller.h" #include "PHY_IGraphicController.h" #include "SG_Node.h" -#include "SG_Controller.h" #include "KX_ClientObjectInfo.h" #include "RAS_BucketManager.h" #include "KX_RayCast.h" diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 68fe735eb79..5d0c6a8bb83 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -142,8 +142,6 @@ extern "C" { #include "BKE_idcode.h" } -#include "NG_NetworkScene.h" //Needed for sendMessage() - // 'local' copy of canvas ptr, for window height/width python scripts #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 4a147b4eb60..b66201f4b47 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1879,7 +1879,6 @@ static void MergeScene_LogicBrick(SCA_ILogicBrick* brick, KX_Scene *to) #ifdef WITH_BULLET #include "CcdGraphicController.h" // XXX ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment()); -#include "CcdPhysicsEnvironment.h" // XXX ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment()); #endif static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene *from) |