Revision: 32668
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32668
Author: campbellbarton
Date: 2010-10-23 17:40:13 +0200 (Sat, 23 Oct 2010)
Log Message:
-----------
CMake options to disable Decimate and Boolean Modifiers: WITH_MOD_BOOLEAN,
WITH_MOD_DECIMATE, renamed WITH_FLUID to WITH_MOD_FLUID
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/Makefile
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-10-23 15:14:54 UTC (rev 32667)
+++ trunk/blender/CMakeLists.txt 2010-10-23 15:40:13 UTC (rev 32668)
@@ -68,7 +68,6 @@
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
-OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON)
OPTION(WITH_IK_ITASC "Enable ITASC IK solver" ON)
OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio
effects)" OFF)
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
@@ -81,6 +80,11 @@
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" OFF)
ENDIF()
+# Modifiers
+OPTION(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+OPTION(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
+OPTION(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+
# Image format support
OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support
(http://www.openexr.com)" ON)
OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support
(http://www.openjpeg.org/)" OFF)
Modified: trunk/blender/intern/CMakeLists.txt
===================================================================
--- trunk/blender/intern/CMakeLists.txt 2010-10-23 15:14:54 UTC (rev 32667)
+++ trunk/blender/intern/CMakeLists.txt 2010-10-23 15:40:13 UTC (rev 32668)
@@ -29,20 +29,25 @@
ADD_SUBDIRECTORY(ghost)
ADD_SUBDIRECTORY(guardedalloc)
ADD_SUBDIRECTORY(moto)
-ADD_SUBDIRECTORY(container)
ADD_SUBDIRECTORY(memutil)
-ADD_SUBDIRECTORY(decimation)
ADD_SUBDIRECTORY(iksolver)
-ADD_SUBDIRECTORY(boolop)
ADD_SUBDIRECTORY(opennl)
ADD_SUBDIRECTORY(smoke)
-IF(WITH_FLUID)
+IF(WITH_MOD_FLUID)
ADD_SUBDIRECTORY(elbeem)
-ENDIF(WITH_FLUID)
+ENDIF(WITH_MOD_FLUID)
+IF(WITH_MOD_DECIMATE)
+ ADD_SUBDIRECTORY(container)
+ ADD_SUBDIRECTORY(decimation)
+ENDIF(WITH_MOD_DECIMATE)
+
+IF(WITH_MOD_BOOLEAN)
+ ADD_SUBDIRECTORY(boolop)
+ ADD_SUBDIRECTORY(bsp)
+ENDIF(WITH_MOD_BOOLEAN)
+
IF(WITH_IK_ITASC)
ADD_SUBDIRECTORY(itasc)
ENDIF(WITH_IK_ITASC)
-
-ADD_SUBDIRECTORY(bsp)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-10-23
15:14:54 UTC (rev 32667)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-10-23
15:40:13 UTC (rev 32668)
@@ -196,9 +196,9 @@
ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP)
-IF(NOT WITH_FLUID)
+IF(NOT WITH_MOD_FLUID)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
IF(WITH_JACK)
ADD_DEFINITIONS(-DWITH_JACK)
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-10-23
15:14:54 UTC (rev 32667)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-10-23
15:40:13 UTC (rev 32668)
@@ -43,9 +43,9 @@
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32)
-IF(NOT WITH_FLUID)
+IF(NOT WITH_MOD_FLUID)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
IF(WITH_OPENMP)
ADD_DEFINITIONS(-DPARALLEL=1)
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-10-23
15:14:54 UTC (rev 32667)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-10-23
15:40:13 UTC (rev 32668)
@@ -112,9 +112,9 @@
ADD_DEFINITIONS(-DWITH_LCMS)
ENDIF(WITH_LCMS)
-IF(NOT WITH_FLUID)
+IF(NOT WITH_MOD_FLUID)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
IF(WITH_FFTW3)
ADD_DEFINITIONS(-DFFTW3=1)
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2010-10-23
15:14:54 UTC (rev 32667)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2010-10-23
15:40:13 UTC (rev 32668)
@@ -31,10 +31,8 @@
../blenkernel
../blenkernel/intern
../render/extern/include
- ../../../intern/guardedalloc
- ../../../intern/decimation/extern
+ ../../../intern/guardedalloc
../../../intern/elbeem/extern
- ../../../intern/bsp/extern
${ZLIB_INC}
)
@@ -43,7 +41,6 @@
intern/MOD_array.c
intern/MOD_bevel.c
intern/MOD_boolean.c
- intern/MOD_boolean_util.c
intern/MOD_build.c
intern/MOD_cast.c
intern/MOD_cloth.c
@@ -79,9 +76,19 @@
intern/MOD_wave.c
)
-IF(NOT WITH_FLUID)
+IF(WITH_MOD_BOOLEAN)
+ ADD_DEFINITIONS(-DWITH_MOD_BOOLEAN)
+ LIST(APPEND SRC intern/MOD_boolean_util.c)
+ LIST(APPEND INC ../../../intern/bsp/extern)
+ENDIF(WITH_MOD_BOOLEAN)
+
+IF(WITH_MOD_DECIMATE)
+ ADD_DEFINITIONS(-DWITH_MOD_DECIMATE)
+ LIST(APPEND INC ../../../intern/decimation/extern)
+ENDIF(WITH_MOD_BOOLEAN)
+
+IF(NOT WITH_MOD_FLUID)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
BLENDERLIB(bf_modifiers "${SRC}" "${INC}")
-
Modified: trunk/blender/source/blender/modifiers/Makefile
===================================================================
--- trunk/blender/source/blender/modifiers/Makefile 2010-10-23 15:14:54 UTC
(rev 32667)
+++ trunk/blender/source/blender/modifiers/Makefile 2010-10-23 15:40:13 UTC
(rev 32668)
@@ -30,5 +30,5 @@
SOURCEDIR = source/blender/modifiers
DIRS = intern
-
+CFLAGS += -DWITH_MOD_BOOLEAN -DWITH_MOD_BOOLEAN
include nan_subdirs.mk
Modified: trunk/blender/source/blender/modifiers/SConscript
===================================================================
--- trunk/blender/source/blender/modifiers/SConscript 2010-10-23 15:14:54 UTC
(rev 32667)
+++ trunk/blender/source/blender/modifiers/SConscript 2010-10-23 15:40:13 UTC
(rev 32668)
@@ -12,6 +12,10 @@
defs = []
+# could be made optional
+defs += ['WITH_MOD_BOOLEAN']
+defs += ['WITH_MOD_DECIMATE']
+
if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM')
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2010-10-23
15:14:54 UTC (rev 32667)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2010-10-23
15:40:13 UTC (rev 32668)
@@ -82,7 +82,7 @@
}
}
-
+#ifdef WITH_MOD_BOOLEAN
static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
DerivedMesh *derivedData,
int UNUSED(useRenderParams),
@@ -107,6 +107,15 @@
return derivedData;
}
+#else // WITH_MOD_BOOLEAN
+static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
+ DerivedMesh *derivedData,
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
+{
+ return derivedData;
+}
+#endif // WITH_MOD_BOOLEAN
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData
*UNUSED(md))
{
Modified: trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
2010-10-23 15:14:54 UTC (rev 32667)
+++ trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
2010-10-23 15:40:13 UTC (rev 32668)
@@ -42,9 +42,10 @@
#include "MEM_guardedalloc.h"
+#ifdef WITH_MOD_DECIMATE
#include "LOD_decimation.h"
+#endif
-
static void initData(ModifierData *md)
{
DecimateModifierData *dmd = (DecimateModifierData*) md;
@@ -60,6 +61,7 @@
tdmd->percent = dmd->percent;
}
+#ifdef WITH_MOD_DECIMATE
static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
DerivedMesh *derivedData,
int UNUSED(useRenderParams),
@@ -176,8 +178,16 @@
exit:
return result;
}
+#else // WITH_MOD_DECIMATE
+static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
+ DerivedMesh *derivedData,
+ int UNUSED(useRenderParams),
+ int UNUSED(isFinalCalc))
+{
+ return derivedData;
+}
+#endif // WITH_MOD_DECIMATE
-
ModifierTypeInfo modifierType_Decimate = {
/* name */ "Decimate",
/* structName */ "DecimateModifierData",
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-10-23 15:14:54 UTC (rev
32667)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-10-23 15:40:13 UTC (rev
32668)
@@ -454,9 +454,9 @@
SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
-IF(WITH_FLUID)
+IF(WITH_MOD_FLUID)
LIST(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-ENDIF(WITH_FLUID)
+ENDIF(WITH_MOD_FLUID)
#IF(UNIX)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
