diff options
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 5 | ||||
-rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 3 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 7 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature_retarget.c | 8 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 10 | ||||
-rw-r--r-- | source/blender/editors/armature/reeb.c | 13 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 9 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_constraints.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 15 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 5 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 16 | ||||
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/initrender.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
16 files changed, 16 insertions, 94 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index a4e7676c602..4f4bafd00b4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -29,7 +29,6 @@ * \ingroup bke */ - #include <stddef.h> #include <math.h> @@ -98,8 +97,6 @@ #include <string.h> #endif // WITH_MOD_FLUID -//XXX #include "BIF_screen.h" - EffectorWeights *BKE_add_effector_weights(Group *group) { EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights"); diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index d5b1d3c98c8..0e73d10fa5f 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -29,8 +29,6 @@ * \ingroup bke */ - - #include <stdio.h> #include <string.h> #include <math.h> @@ -65,7 +63,6 @@ #include "BKE_deform.h" -//XXX #include "BIF_editdeform.h" void calc_lat_fudu(int flag, int res, float *fu, float *du) { diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index ed7fb39a015..2c105e4940d 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -78,9 +78,8 @@ variables on the UI for now #include "BKE_DerivedMesh.h" #include "BKE_pointcache.h" #include "BKE_deform.h" -#include "BKE_mesh.h" -//XXX #include "BIF_editdeform.h" -//XXX #include "BIF_graphics.h" +#include "BKE_mesh.h" + #include "PIL_time.h" // #include "ONL_opennl.h" remove linking to ONL for now diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index a499f9a81ea..6ce8b9ecf91 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -52,11 +52,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -//XXX #include "BIF_toolbox.h" - #include "BKE_font.h" - #include "DNA_vfont_types.h" #include "DNA_packedFile_types.h" #include "DNA_curve_types.h" diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 753940cd4f2..7d4134aca13 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -95,7 +95,9 @@ void ** g_highlightedNodesRead; } \ } \ } -void COM_startReadHighlights() { + +void COM_startReadHighlights() +{ if (g_highlightedNodesRead) { delete [] g_highlightedNodesRead; } @@ -108,7 +110,8 @@ void COM_startReadHighlights() { } } -int COM_isHighlightedbNode(bNode* bnode) { +int COM_isHighlightedbNode(bNode* bnode) +{ if (!g_highlightedNodesRead) return false; for (int i = 0 ; i < MAX_HIGHLIGHT; i++) { void* p = g_highlightedNodesRead[i]; diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index 91c342ec070..caadee5f941 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -25,7 +25,6 @@ * \ingroup edarmature */ - #include <ctype.h> #include <stdlib.h> #include <string.h> @@ -49,8 +48,6 @@ #include "BLI_rand.h" #include "BLI_threads.h" -//#include "BDR_editobject.h" - #include "BKE_constraint.h" #include "BKE_armature.h" #include "BKE_context.h" @@ -60,10 +57,7 @@ #include "BIF_retarget.h" - -//#include "mydevice.h" -#include "reeb.h" // FIX ME -//#include "blendef.h" +#include "reeb.h" /* FIX ME */ #include "armature_intern.h" diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index 06ecf76ba3e..78d3d8dc64d 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -22,7 +22,6 @@ * \ingroup edarmature */ - #include <string.h> #include <math.h> #include <float.h> @@ -49,27 +48,18 @@ #include "ED_screen.h" #include "BIF_gl.h" -//#include "BIF_screen.h" -//#include "BIF_space.h" -//#include "BIF_mywindow.h" #include "ED_armature.h" #include "armature_intern.h" -//#include "BIF_sketch.h" #include "BIF_retarget.h" #include "BIF_generate.h" -//#include "BIF_interface.h" #include "ED_transform.h" #include "WM_api.h" #include "WM_types.h" -//#include "blendef.h" -//#include "mydevice.h" #include "reeb.h" - - typedef int (*GestureDetectFct)(bContext *, SK_Gesture *, SK_Sketch *); typedef void (*GestureApplyFct)(bContext *, SK_Gesture *, SK_Sketch *); diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index af252ffe60c..ce4e1db23b5 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -24,11 +24,10 @@ * \ingroup edarmature */ - #include <math.h> -#include <string.h> // for memcpy +#include <string.h> /* for memcpy */ #include <stdio.h> -#include <stdlib.h> // for qsort +#include <stdlib.h> /* for qsort */ #include <float.h> #include "DNA_scene_types.h" @@ -45,16 +44,8 @@ #include "BLI_ghash.h" #include "BLI_heap.h" -//#include "BDR_editobject.h" - -//#include "BIF_interface.h" -//#include "BIF_toolbox.h" -//#include "BIF_graphics.h" - #include "BKE_mesh.h" -//#include "blendef.h" - #include "ONL_opennl.h" #include "reeb.h" diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 5232371fcaf..7bcf6ba58f1 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -29,7 +29,6 @@ * \ingroup edtransform */ - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -37,9 +36,9 @@ #include <float.h> #ifndef WIN32 -#include <unistd.h> +# include <unistd.h> #else -#include <io.h> +# include <io.h> #endif #include "MEM_guardedalloc.h" @@ -90,10 +89,6 @@ #include "UI_resources.h" -//#include "blendef.h" -// -//#include "mydevice.h" - #include "transform.h" #include <stdio.h> diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 034ea3eb704..7c0d4f10186 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -53,7 +53,6 @@ #include "BKE_context.h" - #include "ED_image.h" #include "ED_view3d.h" @@ -61,13 +60,8 @@ #include "BLI_utildefines.h" #include "BLI_string.h" -//#include "blendef.h" -// -//#include "mydevice.h" - #include "UI_resources.h" - #include "transform.h" static void drawObjectConstraint(TransInfo *t); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 9f335b4afe7..dba597d316d 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -29,13 +29,12 @@ * \ingroup edtransform */ - #include <string.h> #include <math.h> #include "MEM_guardedalloc.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLO_sys_types.h" /* for intptr_t support */ #include "DNA_anim_types.h" #include "DNA_armature_types.h" @@ -58,14 +57,8 @@ #include "RNA_access.h" -//#include "BIF_screen.h" -//#include "BIF_mywindow.h" #include "BIF_gl.h" #include "BIF_glutil.h" -//#include "BIF_editmesh.h" -//#include "BIF_editsima.h" -//#include "BIF_editparticle.h" -//#include "BIF_meshtools.h" #include "BKE_animsys.h" #include "BKE_action.h" @@ -96,17 +89,11 @@ #include "ED_clip.h" #include "ED_screen.h" -//#include "BDR_unwrapper.h" - #include "WM_types.h" #include "WM_api.h" #include "UI_resources.h" -//#include "blendef.h" -// -//#include "mydevice.h" - #include "transform.h" /* ************************** Functions *************************** */ diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 97fc173f9a1..b9583fc21e1 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -50,11 +50,6 @@ #include "BLF_translation.h" -//#include "BIF_editmesh.h" -//#include "BIF_interface.h" -//#include "BIF_space.h" -//#include "BIF_toolbox.h" - #include "ED_armature.h" #include "ED_mesh.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 3847087111e..1286a520bb9 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -29,7 +29,6 @@ * \ingroup edtransform */ - #include <stdlib.h> #include <math.h> #include <float.h> @@ -41,7 +40,7 @@ #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" // Temporary, for snapping to other unselected meshes +#include "DNA_meshdata_types.h" /* Temporary, for snapping to other unselected meshes */ #include "DNA_node_types.h" #include "DNA_space_types.h" #include "DNA_screen_types.h" @@ -54,20 +53,11 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -//#include "BDR_drawobject.h" -// -//#include "editmesh.h" -//#include "BIF_editsima.h" #include "BIF_gl.h" -//#include "BIF_mywindow.h" -//#include "BIF_screen.h" -//#include "BIF_editsima.h" -//#include "BIF_drawimage.h" -//#include "BIF_editmesh.h" #include "BKE_DerivedMesh.h" #include "BKE_object.h" -#include "BKE_anim.h" /* for duplis */ +#include "BKE_anim.h" /* for duplis */ #include "BKE_context.h" #include "BKE_tessmesh.h" #include "BKE_mesh.h" @@ -88,8 +78,6 @@ #include "transform.h" -//#include "blendef.h" /* for selection modes */ - #define USE_BVH_FACE_SNAP /********************* PROTOTYPES ***********************/ diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index eaab1b988ae..3408eb74b58 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -27,7 +27,6 @@ * \ingroup render */ - #include <math.h> #include <stdlib.h> #include <stdio.h> diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 33a777381aa..cc8f6682781 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -27,8 +27,6 @@ * \ingroup render */ - - /* Global includes */ #include <math.h> diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 2098d872357..7a885d60bff 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -28,7 +28,6 @@ * \ingroup wm */ - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -63,7 +62,6 @@ #include "BKE_tracking.h" /* free tracking clipboard */ #include "BLI_listbase.h" -// #include "BLI_scanfill.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -75,7 +73,7 @@ #endif #ifdef WITH_GAMEENGINE -#include "BL_System.h" +# include "BL_System.h" #endif #include "GHOST_Path-api.h" #include "GHOST_C-api.h" |