Revision: 49051
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49051
Author: campbellbarton
Date: 2012-07-18 23:07:07 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
code cleanup: remove commented includes - mostly from 2.4x
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2012-07-18
23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2012-07-18
23:07:07 UTC (rev 49051)
@@ -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");
Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c 2012-07-18
23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c 2012-07-18
23:07:07 UTC (rev 49051)
@@ -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)
{
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-07-18
23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-07-18
23:07:07 UTC (rev 49051)
@@ -78,9 +78,8 @@
#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
Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-07-18
23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-07-18
23:07:07 UTC (rev 49051)
@@ -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"
Modified: trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-07-18 23:07:07 UTC (rev 49051)
@@ -95,7 +95,9 @@
} \
} \
}
-void COM_startReadHighlights() {
+
+void COM_startReadHighlights()
+{
if (g_highlightedNodesRead) {
delete [] g_highlightedNodesRead;
}
@@ -108,7 +110,8 @@
}
}
-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];
Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c
2012-07-18 23:07:07 UTC (rev 49051)
@@ -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,11 +57,8 @@
#include "BIF_retarget.h"
+#include "reeb.h" /* FIX ME */
-//#include "mydevice.h"
-#include "reeb.h" // FIX ME
-//#include "blendef.h"
-
#include "armature_intern.h"
/************ RIG RETARGET DATA STRUCTURES ***************/
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2012-07-18 23:07:07 UTC (rev 49051)
@@ -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 *);
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2012-07-18
23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2012-07-18
23:07:07 UTC (rev 49051)
@@ -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"
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-07-18
23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-07-18
23:07:07 UTC (rev 49051)
@@ -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>
Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c
2012-07-18 23:07:07 UTC (rev 49051)
@@ -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);
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2012-07-18 23:07:07 UTC (rev 49051)
@@ -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 *************************** */
Modified:
trunk/blender/source/blender/editors/transform/transform_orientations.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_orientations.c
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/transform/transform_orientations.c
2012-07-18 23:07:07 UTC (rev 49051)
@@ -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"
Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c
2012-07-18 23:03:27 UTC (rev 49050)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c
2012-07-18 23:07:07 UTC (rev 49051)
@@ -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"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
