Revision: 37452
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37452
Author: psy-fi
Date: 2011-06-13 14:55:39 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
merge with trunk -r37451
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37451
Modified Paths:
--------------
branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-onion/build_files/cmake/macros.cmake
branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion/intern/elbeem/extern/elbeem.h
branches/soc-2011-onion/intern/elbeem/intern/simulation_object.cpp
branches/soc-2011-onion/intern/elbeem/intern/solver_class.h
branches/soc-2011-onion/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-onion/intern/elbeem/intern/solver_interface.h
branches/soc-2011-onion/release/scripts/modules/console/intellisense.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-onion/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-onion/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion/source/blender/editors/object/object_modifier.c
branches/soc-2011-onion/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-onion/source/blender/editors/render/render_internal.c
branches/soc-2011-onion/source/blender/editors/space_console/console_draw.c
branches/soc-2011-onion/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-onion/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-onion/source/blender/editors/util/ed_util.c
branches/soc-2011-onion/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-onion/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-onion/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-onion/source/blender/render/intern/include/render_types.h
branches/soc-2011-onion/source/blender/render/intern/source/convertblender.c
branches/soc-2011-onion/source/blender/render/intern/source/envmap.c
branches/soc-2011-onion/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion/source/blenderplayer/CMakeLists.txt
branches/soc-2011-onion/source/creator/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-onion/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-onion/source/gameengine/Physics/Bullet/CcdPhysicsController.h
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37386
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37451
Modified: branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
2011-06-13 14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
2011-06-13 14:55:39 UTC (rev 37452)
@@ -53,8 +53,17 @@
if(NOT _Found_PYTHON_H)
message(FATAL_ERROR "Python.h not found")
endif()
+
+ unset(_Found_PYTHON_H)
+ unset(_Python_HEADER)
+ unset(_CURRENT_ABI_FLAGS)
+ unset(_CURRENT_PATH)
+
endif()
+unset(_Python_ABI_FLAGS)
+unset(_Python_PATHS)
+
#=============================================================================
# now the python versions are found
Modified: branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py
2011-06-13 14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py
2011-06-13 14:55:39 UTC (rev 37452)
@@ -23,15 +23,16 @@
# <pep8 compliant>
-IGNORE = \
- "/test/",\
- "/decimate_glut_test/",\
- "/BSP_GhostTest/",\
- "/release/",\
- "/xembed/",\
- "/decimation/intern/future/",\
- "/TerraplayNetwork/",\
- "/ik_glut_test/"
+IGNORE = (
+ "/test/",
+ "/decimate_glut_test/",
+ "/BSP_GhostTest/",
+ "/release/",
+ "/xembed/",
+ "/decimation/intern/future/",
+ "/TerraplayNetwork/",
+ "/ik_glut_test/",
+ )
import os
from os.path import join, dirname, normpath, abspath, splitext
@@ -104,7 +105,7 @@
found = True
break
- if "list(APPEND SRC" in l:
+ if "list(APPEND SRC" in l or ('list(APPEND ' in l and
l.endswith("SRC")):
if l.endswith(")"):
raise Exception("strict formatting not kept
'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
found = True
@@ -136,7 +137,9 @@
if not l:
pass
elif l.startswith("$"):
- print("Cant use var '%s' %s:%d" % (l, f, i))
+ # assume if it ends with SRC we know about it
+ if not l.split("}")[0].endswith("SRC"):
+ print("Can't use var '%s' %s:%d" % (l, f, i))
elif len(l.split()) > 1:
raise Exception("Multi-line define '%s' %s:%d" % (l,
f, i))
else:
Modified: branches/soc-2011-onion/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-06-13
14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-06-13
14:55:39 UTC (rev 37452)
@@ -5,22 +5,28 @@
# use it instead of include_directories()
macro(blender_include_dirs
includes)
-
- foreach(inc ${ARGV})
- get_filename_component(abs_inc ${inc} ABSOLUTE)
- list(APPEND all_incs ${abs_inc})
+ set(_ALL_INCS "")
+ foreach(_INC ${ARGV})
+ get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+ list(APPEND _ALL_INCS ${_ABS_INC})
endforeach()
- include_directories(${all_incs})
+ include_directories(${_ALL_INCS})
+ unset(_INC)
+ unset(_ABS_INC)
+ unset(_ALL_INCS)
endmacro()
macro(blender_include_dirs_sys
includes)
-
- foreach(inc ${ARGV})
- get_filename_component(abs_inc ${inc} ABSOLUTE)
- list(APPEND all_incs ${abs_inc})
+ set(_ALL_INCS "")
+ foreach(_INC ${ARGV})
+ get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+ list(APPEND _ALL_INCS ${_ABS_INC})
endforeach()
- include_directories(SYSTEM ${all_incs})
+ include_directories(SYSTEM ${_ALL_INCS})
+ unset(_INC)
+ unset(_ABS_INC)
+ unset(_ALL_INCS)
endmacro()
macro(blender_source_group
@@ -29,14 +35,17 @@
# Group by location on disk
source_group("Source Files" FILES CMakeLists.txt)
- foreach(SRC ${sources})
- get_filename_component(SRC_EXT ${SRC} EXT)
- if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
- source_group("Header Files" FILES ${SRC})
+ foreach(_SRC ${sources})
+ get_filename_component(_SRC_EXT ${_SRC} EXT)
+ if(${_SRC_EXT} MATCHES ".h" OR ${_SRC_EXT} MATCHES ".hpp")
+ source_group("Header Files" FILES ${_SRC})
else()
- source_group("Source Files" FILES ${SRC})
+ source_group("Source Files" FILES ${_SRC})
endif()
endforeach()
+
+ unset(_SRC)
+ unset(_SRC_EXT)
endmacro()
@@ -196,10 +205,11 @@
endif()
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
- foreach(loop_var ${OPENEXR_LIB})
- target_link_libraries(${target} debug
${loop_var}_d)
- target_link_libraries(${target} optimized
${loop_var})
+ foreach(_LOOP_VAR ${OPENEXR_LIB})
+ target_link_libraries(${target} debug
${_LOOP_VAR}_d)
+ target_link_libraries(${target} optimized
${_LOOP_VAR})
endforeach()
+ unset(_LOOP_VAR)
else()
target_link_libraries(${target} ${OPENEXR_LIB})
endif()
@@ -212,10 +222,11 @@
endif()
if(WITH_OPENCOLLADA)
if(WIN32 AND NOT UNIX)
- foreach(loop_var ${OPENCOLLADA_LIB})
- target_link_libraries(${target} debug
${loop_var}_d)
- target_link_libraries(${target} optimized
${loop_var})
+ foreach(_LOOP_VAR ${OPENCOLLADA_LIB})
+ target_link_libraries(${target} debug
${_LOOP_VAR}_d)
+ target_link_libraries(${target} optimized
${_LOOP_VAR})
endforeach()
+ unset(_LOOP_VAR)
target_link_libraries(${target} debug ${PCRE_LIB}_d)
target_link_libraries(${target} optimized ${PCRE_LIB})
if(EXPAT_LIB)
@@ -472,4 +483,13 @@
unset(_reset_standard_cflags_rel)
unset(_reset_standard_cxxflags_rel)
+
+ # --------------------------------------------------
+ # workaround for omission in cmake 2.8.4's GNU.cmake
+ if(CMAKE_COMPILER_IS_GNUCC)
+ if(NOT DARWIN)
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+ endif()
+ endif()
+
endmacro()
Modified: branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
2011-06-13 14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
2011-06-13 14:55:39 UTC (rev 37452)
@@ -118,7 +118,7 @@
BF_FREETYPE_LIB = 'freetype2ST'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
BF_QUICKTIME = LIBDIR + '/QTDevWin'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
BF_QUICKTIME_LIB = 'qtmlClient'
Modified: branches/soc-2011-onion/intern/elbeem/extern/elbeem.h
===================================================================
--- branches/soc-2011-onion/intern/elbeem/extern/elbeem.h 2011-06-13
14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/intern/elbeem/extern/elbeem.h 2011-06-13
14:55:39 UTC (rev 37452)
@@ -77,6 +77,10 @@
/* boundary types and settings for domain walls */
short domainobsType;
float domainobsPartslip;
+
+ /* what surfaces to generate */
+ int mFsSurfGenSetting;
+
/* generate speed vectors for vertices (e.g. for image based motion
blur)*/
short generateVertexVectors;
/* strength of surface smoothing */
@@ -108,11 +112,13 @@
#define OB_FLUIDSIM_PARTICLE 64
#define OB_FLUIDSIM_CONTROL 128
-// defines for elbeemMesh->obstacleType below
+// defines for elbeemMesh->obstacleType below (low bits) high bits (>=64) are
reserved for mFsSurfGenSetting flags which are defined in solver_class.h
#define FLUIDSIM_OBSTACLE_NOSLIP 1
#define FLUIDSIM_OBSTACLE_PARTSLIP 2
#define FLUIDSIM_OBSTACLE_FREESLIP 3
+#define FLUIDSIM_FSSG_NOOBS 64
+
#define OB_VOLUMEINIT_VOLUME 1
#define OB_VOLUMEINIT_SHELL 2
#define OB_VOLUMEINIT_BOTH (OB_VOLUMEINIT_SHELL|OB_VOLUMEINIT_VOLUME)
Modified: branches/soc-2011-onion/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- branches/soc-2011-onion/intern/elbeem/intern/simulation_object.cpp
2011-06-13 14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/intern/elbeem/intern/simulation_object.cpp
2011-06-13 14:55:39 UTC (rev 37452)
@@ -181,6 +181,9 @@
mpLbm->setGenerateParticles(mpElbeemSettings->generateParticles);
// set initial particles
mpParts->setNumInitialParticles(mpElbeemSettings->numTracerParticles);
+
+ // surface generation flag
+ mpLbm->setSurfGenSettings(mpElbeemSettings->mFsSurfGenSetting);
string dinitType = string("no");
if
(mpElbeemSettings->domainobsType==FLUIDSIM_OBSTACLE_PARTSLIP) dinitType =
string("part");
Modified: branches/soc-2011-onion/intern/elbeem/intern/solver_class.h
===================================================================
--- branches/soc-2011-onion/intern/elbeem/intern/solver_class.h 2011-06-13
14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/intern/elbeem/intern/solver_class.h 2011-06-13
14:55:39 UTC (rev 37452)
@@ -308,6 +308,9 @@
//! for raytracing, preprocess
void prepareVisualization( void );
+ /* surface generation settings */
+ virtual void setSurfGenSettings(short value);
+
protected:
//! internal quick print function (for debugging)
Modified: branches/soc-2011-onion/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/soc-2011-onion/intern/elbeem/intern/solver_init.cpp
2011-06-13 14:11:29 UTC (rev 37451)
+++ branches/soc-2011-onion/intern/elbeem/intern/solver_init.cpp
2011-06-13 14:55:39 UTC (rev 37452)
@@ -539,6 +539,15 @@
/******************************************************************************
+ * (part of enabling chapter 6 of "Free Surface Flows with Moving and
Deforming Objects for LBM")
+ *****************************************************************************/
+void LbmFsgrSolver::setSurfGenSettings(short value)
+{
+ mFsSurfGenSetting = value;
+}
+
+
+/******************************************************************************
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
