[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28152] trunk/blender/source/blender/ modifiers: modifier include cleanup, this might need fixes on other systems but hard to avoid.
Campbell Barton
ideasman42 at gmail.com
Tue Apr 13 00:33:45 CEST 2010
Revision: 28152
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28152
Author: campbellbarton
Date: 2010-04-13 00:33:43 +0200 (Tue, 13 Apr 2010)
Log Message:
-----------
modifier include cleanup, this might need fixes on other systems but hard to avoid.
also removed unused stuff from cmake modifier file
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_multires.c
trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_shapekey.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_softbody.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
trunk/blender/source/blender/modifiers/intern/MOD_surface.c
trunk/blender/source/blender/modifiers/intern/MOD_util.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2010-04-12 22:33:43 UTC (rev 28152)
@@ -28,33 +28,18 @@
SET(INC
. ./intern
- ../../../intern/guardedalloc
- ../include
../blenlib
../makesdna
../blenkernel
../blenkernel/intern
../render/extern/include
+ ../../../intern/guardedalloc
../../../intern/decimation/extern
../../../intern/elbeem/extern
../../../intern/bsp/extern
${ZLIB_INC}
)
-IF(WITH_LZO)
- SET(INC ${INC} ../../../extern/lzo/minilzo)
- ADD_DEFINITIONS(-DWITH_LZO)
-ENDIF(WITH_LZO)
-
-IF(WITH_LZMA)
- SET(INC ${INC} ../../../extern/lzma)
- ADD_DEFINITIONS(-DWITH_LZMA)
-ENDIF(WITH_LZMA)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
IF(NOT WITH_ELBEEM)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
ENDIF(NOT WITH_ELBEEM)
Modified: trunk/blender/source/blender/modifiers/intern/MOD_armature.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -30,59 +30,21 @@
*
*/
-#include "stddef.h"
#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-#include "BKE_action.h"
#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
+#include "MEM_guardedalloc.h"
+
#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-#include "CCGSubSurf.h"
-
-#include "MOD_modifiertypes.h"
#include "MOD_util.h"
-/* Armature */
-
static void initData(ModifierData *md)
{
ArmatureModifierData *amd = (ArmatureModifierData*) md;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -30,56 +30,23 @@
*
*/
-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+/* Array modifier: duplicates the object multiple times along an axis */
+#include "DNA_curve_types.h"
+#include "DNA_meshdata_types.h"
+
#include "BLI_math.h"
-#include "BLI_rand.h"
#include "BLI_ghash.h"
#include "BLI_edgehash.h"
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-
-
-#include "BKE_action.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
#include "depsgraph_private.h"
-#include "MOD_modifiertypes.h"
-
-/* Array */
-/* Array modifier: duplicates the object multiple times along an axis
-*/
-
static void initData(ModifierData *md)
{
ArrayModifierData *amd = (ArrayModifierData*) md;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -30,54 +30,12 @@
*
*/
-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-#include "MOD_modifiertypes.h"
-
static void initData(ModifierData *md)
{
BevelModifierData *bmd = (BevelModifierData*) md;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -30,52 +30,12 @@
*
*/
-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-#include "MOD_modifiertypes.h"
#include "MOD_boolean_util.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -28,21 +28,14 @@
* CSG operations.
*/
-#include <string.h>
-#include <math.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_math.h"
-#include "BLI_ghash.h"
-
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "CSG_BooleanOps.h"
+#include "BLI_math.h"
+#include "BLI_ghash.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_depsgraph.h"
@@ -50,8 +43,8 @@
#include "BKE_mesh.h"
#include "BKE_object.h"
+#include "CSG_BooleanOps.h"
-
/**
* Here's the vertex iterator structure used to walk through
* the blender vertex structure.
Modified: trunk/blender/source/blender/modifiers/intern/MOD_build.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_build.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_build.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -30,50 +30,19 @@
*
*/
-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
#include "BLI_rand.h"
-#include "BLI_uvproject.h"
#include "BLI_ghash.h"
-#include "MEM_guardedalloc.h"
-
#include "DNA_scene_types.h"
#include "DNA_meshdata_types.h"
-#include "DNA_object_fluidsim.h"
-
-#include "BKE_action.h"
#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
-#include "BKE_paint.h"
#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
static void initData(ModifierData *md)
{
BuildModifierData *bmd = (BuildModifierData*) md;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_cast.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_cast.c 2010-04-12 17:45:51 UTC (rev 28151)
+++ trunk/blender/source/blender/modifiers/intern/MOD_cast.c 2010-04-12 22:33:43 UTC (rev 28152)
@@ -30,55 +30,17 @@
*
*/
-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
+#include "DNA_meshdata_types.h"
#include "BLI_math.h"
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-#include "DNA_object_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_customdata_types.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list