[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41372] branches/bmesh/blender: svn merge -r41335:41371
Campbell Barton
ideasman42 at gmail.com
Sun Oct 30 02:27:50 CET 2011
Revision: 41372
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41372
Author: campbellbarton
Date: 2011-10-30 01:27:49 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
svn merge -r41335:41371
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41335
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/intern/SConscript
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenlib/BLI_string.h
branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/physics/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/render/render_opengl.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/gpu/GPU_extensions.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41335
+ /trunk/blender:39992-41371
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/CMakeLists.txt 2011-10-30 01:27:49 UTC (rev 41372)
@@ -65,7 +65,7 @@
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG _DEBUG)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE NDEBUG)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL NDEBUG)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO DEBUG _DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
#-----------------------------------------------------------------------------
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/SConstruct 2011-10-30 01:27:49 UTC (rev 41372)
@@ -253,7 +253,9 @@
target_env_defs['WITH_BF_BULLET'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_FLUID'] = False
+ target_env_defs['WITH_BF_DECIMATE'] = False
+ target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
@@ -323,9 +325,9 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
-# disable elbeem (fluidsim) compilation?
-if env['BF_NO_ELBEEM'] == 1:
- env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+# build without elbeem (fluidsim)?
+if env['WITH_BF_FLUID'] == 1:
+ env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
if btools.ENDIAN == "big":
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-10-30 01:27:49 UTC (rev 41372)
@@ -150,7 +150,9 @@
'BF_GHOST_DEBUG',
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
- 'BF_NO_ELBEEM',
+ 'WITH_BF_FLUID',
+ 'WITH_BF_DECIMATE',
+ 'WITH_BF_BOOLEAN',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
@@ -250,7 +252,9 @@
(BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
- (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),
+ (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
+ (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
+ (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
('BF_OPENAL', 'base path for OpenAL', ''),
Modified: branches/bmesh/blender/intern/SConscript
===================================================================
--- branches/bmesh/blender/intern/SConscript 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/intern/SConscript 2011-10-30 01:27:49 UTC (rev 41372)
@@ -22,7 +22,7 @@
# perhaps get rid of intern/csg?
NEW_CSG='false'
-if not env['BF_NO_ELBEEM']:
+if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
if NEW_CSG=='false':
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41335
+ /trunk/blender/release:31524-41371
Modified: branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt 2011-10-30 01:27:49 UTC (rev 41372)
@@ -327,8 +327,8 @@
add_definitions(-DPARALLEL=1)
endif()
-if(NOT WITH_MOD_FLUID)
- add_definitions(-DDISABLE_ELBEEM)
+if(WITH_MOD_FLUID)
+ add_definitions(-DWITH_MOD_FLUID)
endif()
if(WITH_MOD_SMOKE)
Modified: branches/bmesh/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/SConscript 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenkernel/SConscript 2011-10-30 01:27:49 UTC (rev 41372)
@@ -80,8 +80,8 @@
if env['WITH_BF_OPENMP']:
defs.append('PARALLEL=1')
-if env['BF_NO_ELBEEM']:
- defs.append('DISABLE_ELBEEM')
+if env['WITH_BF_FLUID']:
+ defs.append('WITH_MOD_FLUID')
if env['WITH_BF_LZO']:
incs += ' #/extern/lzo/minilzo'
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/effect.c 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/effect.c 2011-10-30 01:27:49 UTC (rev 41372)
@@ -91,12 +91,12 @@
#include "RE_shader_ext.h"
/* fluid sim particle import */
-#ifndef DISABLE_ELBEEM
+#ifdef WITH_MOD_FLUID
#include "DNA_object_fluidsim.h"
#include "LBM_fluidsim.h"
#include <zlib.h>
#include <string.h>
-#endif // DISABLE_ELBEEM
+#endif // WITH_MOD_FLUID
//XXX #include "BIF_screen.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c 2011-10-30 01:27:49 UTC (rev 41372)
@@ -95,13 +95,13 @@
#include "RE_shader_ext.h"
/* fluid sim particle import */
-#ifndef DISABLE_ELBEEM
+#ifdef WITH_MOD_FLUID
#include "DNA_object_fluidsim.h"
#include "LBM_fluidsim.h"
#include <zlib.h>
#include <string.h>
-#endif // DISABLE_ELBEEM
+#endif // WITH_MOD_FLUID
/************************************************/
/* Reacting to system events */
@@ -3916,7 +3916,7 @@
}
/* fluid sim particle import handling, actual loading of particles from file */
- #ifndef DISABLE_ELBEEM
+ #ifdef WITH_MOD_FLUID
{
FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(sim->ob, eModifierType_Fluidsim);
@@ -4009,7 +4009,7 @@
} // fluid sim particles done
}
- #endif // DISABLE_ELBEEM
+ #endif // WITH_MOD_FLUID
}
static int emit_particles(ParticleSimulationData *sim, PTCacheID *pid, float UNUSED(cfra))
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_string.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_string.h 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_string.h 2011-10-30 01:27:49 UTC (rev 41372)
@@ -132,7 +132,6 @@
int BLI_strncasecmp(const char *s1, const char *s2, size_t len);
int BLI_natstrcmp(const char *s1, const char *s2);
size_t BLI_strnlen(const char *str, size_t maxlen);
-
void BLI_timestr(double _time, char *str); /* time var is global */
void BLI_ascii_strtolower(char *str, int len);
Modified: branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/bpath.c 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenlib/intern/bpath.c 2011-10-30 01:27:49 UTC (rev 41372)
@@ -325,8 +325,7 @@
}
if (visit_cb(userdata, path_dst, (const char *)path_src)) {
- BLI_split_dirfile(path_dst, path_dir, path_file,
- sizeof(path_dir), sizeof(path_file));
+ BLI_split_dirfile(path_dst, path_dir, path_file, FILE_MAXDIR, FILE_MAXFILE);
return TRUE;
}
else {
Modified: branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/writefile.c 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/blenloader/intern/writefile.c 2011-10-30 01:27:49 UTC (rev 41372)
@@ -2267,7 +2267,7 @@
static void write_libraries(WriteData *wd, Main *main)
{
- ListBase *lbarray[30];
+ ListBase *lbarray[MAX_LIBARRAY];
ID *id;
int a, tot, foundone;
Modified: branches/bmesh/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/UI_interface.h 2011-10-30 01:14:50 UTC (rev 41371)
+++ branches/bmesh/blender/source/blender/editors/include/UI_interface.h 2011-10-30 01:27:49 UTC (rev 41372)
@@ -749,7 +749,7 @@
void uiTemplateReportsBanner(uiLayout *layout, struct bContext *C);
void uiTemplateKeymapItemProperties(uiLayout *layout, struct PointerRNA *ptr);
-void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, int rows, int maxrows, int type);
+void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, const char *prop_list, int rows, int maxrows, int type);
/* items */
void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list