[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37481] branches/soc-2011-salad: Merging r37437 through r37480 from trunk into soc-2011-salad

Sergey Sharybin g.ulairi at gmail.com
Tue Jun 14 18:20:52 CEST 2011


Revision: 37481
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37481
Author:   nazgul
Date:     2011-06-14 16:20:52 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Merging r37437 through r37480 from trunk into soc-2011-salad

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37437
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37480

Modified Paths:
--------------
    branches/soc-2011-salad/CMakeLists.txt
    branches/soc-2011-salad/build_files/cmake/FindPythonLibsUnix.cmake
    branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py
    branches/soc-2011-salad/build_files/cmake/macros.cmake
    branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-salad/doc/python_api/rst/bge.logic.rst
    branches/soc-2011-salad/doc/python_api/rst/bge.types.rst
    branches/soc-2011-salad/intern/elbeem/extern/elbeem.h
    branches/soc-2011-salad/intern/elbeem/intern/simulation_object.cpp
    branches/soc-2011-salad/intern/elbeem/intern/solver_class.h
    branches/soc-2011-salad/intern/elbeem/intern/solver_init.cpp
    branches/soc-2011-salad/intern/elbeem/intern/solver_interface.h
    branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-salad/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-salad/source/blender/collada/LightExporter.cpp
    branches/soc-2011-salad/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-salad/source/blender/editors/object/object_modifier.c
    branches/soc-2011-salad/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-salad/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-salad/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-salad/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-salad/source/blender/editors/util/ed_util.c
    branches/soc-2011-salad/source/blender/editors/util/undo.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_group.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-salad/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-salad/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2011-salad/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-salad/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-salad/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-salad/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2011-salad/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_CameraActuator.h

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37438
/trunk/blender:36834-37436
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37438
/trunk/blender:36834-37480

Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/CMakeLists.txt	2011-06-14 16:20:52 UTC (rev 37481)
@@ -227,9 +227,6 @@
 	set(WITH_HEADLESS ON)
 endif()
 
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
 TEST_SSE_SUPPORT()
 
 #-----------------------------------------------------------------------------
@@ -238,6 +235,9 @@
 # linux only, not cached
 set(WITH_BINRELOC OFF)
 
+# MAXOSX only, set to avoid uninitialized 
+set(EXETYPE "")
+
 # these are added to later on.
 set(C_WARNINGS "")
 set(CXX_WARNINGS "")

Modified: branches/soc-2011-salad/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/FindPythonLibsUnix.cmake	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/build_files/cmake/FindPythonLibsUnix.cmake	2011-06-14 16:20:52 UTC (rev 37481)
@@ -18,10 +18,18 @@
 	"m;mu;u; ")
 
 string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+
 set(_Python_PATHS
-  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}" "/opt/py${_PYTHON_VERSION_NO_DOTS}" "/usr" "/usr/local")
+	"$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
+	"/opt/py${_PYTHON_VERSION_NO_DOTS}"
+	"/usr"
+	"/usr/local"
+)
 
-if(NOT DEFINED PYTHON_INCLUDE_DIRS)
+if(NOT DEFINED PYTHON_INCLUDE_DIRS OR
+   NOT DEFINED PYTHON_LIBRARY OR
+   NOT DEFINED PYTHON_LIBPATH)
+   
 	message(STATUS "Looking for include Python.h")
 	set(_Found_PYTHON_H OFF)
 
@@ -58,7 +66,15 @@
 	unset(_Python_HEADER)
 	unset(_CURRENT_ABI_FLAGS)
 	unset(_CURRENT_PATH)
-	
+
+
+	set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+	mark_as_advanced(PYTHON_INCLUDE_DIRS)
+	set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+	mark_as_advanced(PYTHON_LIBRARY)
+	set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	mark_as_advanced(PYTHON_LIBPATH)
+	# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 endif()
 
 unset(_Python_ABI_FLAGS)
@@ -68,14 +84,6 @@
 # now the python versions are found
 
 
-set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
-mark_as_advanced(PYTHON_INCLUDE_DIRS)
-set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
-mark_as_advanced(PYTHON_LIBRARY)
-set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-mark_as_advanced(PYTHON_LIBPATH)
-# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-
 if(NOT EXISTS "${PYTHON_INCLUDE_DIRS}/Python.h")
 	message(FATAL_ERROR " Missing python header: ${PYTHON_INCLUDE_DIRS}/Python.h")
 endif()

Modified: branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py	2011-06-14 16:20:52 UTC (rev 37481)
@@ -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-salad/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/macros.cmake	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/build_files/cmake/macros.cmake	2011-06-14 16:20:52 UTC (rev 37481)
@@ -484,8 +484,8 @@
 	unset(_reset_standard_cflags_rel)
 	unset(_reset_standard_cxxflags_rel)
 
-	# --------------------------------------------------
-	# workaround for omission in cmake 2.8.4's GNU.cmake
+	# ------------------------------------------------------------------
+	# workaround for omission in cmake 2.8.4's GNU.cmake, fixed in 2.8.5
 	if(CMAKE_COMPILER_IS_GNUCC)
 		if(NOT DARWIN)
 			set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")

Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py	2011-06-14 16:20:52 UTC (rev 37481)
@@ -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-salad/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2011-salad/doc/python_api/rst/bge.logic.rst	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/doc/python_api/rst/bge.logic.rst	2011-06-14 16:20:52 UTC (rev 37481)
@@ -345,9 +345,9 @@
 
 .. function:: getAverageFrameRate()
 
-   Gets the estimated average framerate
-   
-   :return: The estimed average framerate in frames per second
+   Gets the estimated/average framerate for all the active scenes, not only the current scene.
+
+   :return: The estimated average framerate in frames per second
    :rtype: float
 
 .. function:: getBlendFileList(path = "//")

Modified: branches/soc-2011-salad/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-salad/doc/python_api/rst/bge.types.rst	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/doc/python_api/rst/bge.types.rst	2011-06-14 16:20:52 UTC (rev 37481)
@@ -710,6 +710,12 @@
 
    Applies changes to a camera.
 
+   .. attribute:: damping
+
+      strength of of the camera following movement.
+
+      :type: float
+   
    .. attribute:: min
 
       minimum distance to the target object maintained by the actuator.

Modified: branches/soc-2011-salad/intern/elbeem/extern/elbeem.h
===================================================================
--- branches/soc-2011-salad/intern/elbeem/extern/elbeem.h	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/intern/elbeem/extern/elbeem.h	2011-06-14 16:20:52 UTC (rev 37481)
@@ -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-salad/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- branches/soc-2011-salad/intern/elbeem/intern/simulation_object.cpp	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/intern/elbeem/intern/simulation_object.cpp	2011-06-14 16:20:52 UTC (rev 37481)
@@ -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-salad/intern/elbeem/intern/solver_class.h
===================================================================
--- branches/soc-2011-salad/intern/elbeem/intern/solver_class.h	2011-06-14 16:08:39 UTC (rev 37480)
+++ branches/soc-2011-salad/intern/elbeem/intern/solver_class.h	2011-06-14 16:20:52 UTC (rev 37481)
@@ -308,6 +308,9 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list