[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38659] branches/bmesh/blender: svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Sun Jul 24 15:03:48 CEST 2011
Revision: 38659
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38659
Author: campbellbarton
Date: 2011-07-24 13:03:48 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37335
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/cmake/FindPythonLibsUnix.cmake
branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
branches/bmesh/blender/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/bmesh/blender/build_files/cmake/macros.cmake
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/doc/python_api/rst/bge.logic.rst
branches/bmesh/blender/doc/python_api/rst/bge.types.rst
branches/bmesh/blender/intern/elbeem/extern/elbeem.h
branches/bmesh/blender/intern/elbeem/intern/simulation_object.cpp
branches/bmesh/blender/intern/elbeem/intern/solver_class.h
branches/bmesh/blender/intern/elbeem/intern/solver_init.cpp
branches/bmesh/blender/intern/elbeem/intern/solver_interface.h
branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py
branches/bmesh/blender/release/scripts/modules/console/complete_namespace.py
branches/bmesh/blender/release/scripts/modules/console/intellisense.py
branches/bmesh/blender/release/scripts/modules/console_python.py
branches/bmesh/blender/release/scripts/startup/bl_operators/nla.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object_quick_effects.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/bmesh/blender/source/blender/blenkernel/BKE_depsgraph.h
branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/sca.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenpluginapi/iff.h
branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
branches/bmesh/blender/source/blender/collada/LightExporter.cpp
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/render/render_internal.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_console/console_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/util/ed_util.c
branches/bmesh/blender/source/blender/editors/util/undo.c
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
branches/bmesh/blender/source/blender/imbuf/intern/rectop.c
branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_fluidsim.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_camera.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_controller.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_group.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c
branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/render/intern/source/envmap.c
branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
branches/bmesh/blender/source/blender/render/intern/source/sunsky.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blenderplayer/CMakeLists.txt
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.h
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/bmesh/blender/source/tests/CMakeLists.txt
branches/bmesh/blender/source/tests/bl_load_py_modules.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-37335
+ /trunk/blender:31524-37500
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/CMakeLists.txt 2011-07-24 13:03:48 UTC (rev 38659)
@@ -223,9 +223,6 @@
set(WITH_HEADLESS ON)
endif()
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -234,6 +231,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/bmesh/blender/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/FindPythonLibsUnix.cmake 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/build_files/cmake/FindPythonLibsUnix.cmake 2011-07-24 13:03:48 UTC (rev 38659)
@@ -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)
@@ -53,20 +61,29 @@
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)
+
+
+ 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)
+unset(_Python_PATHS)
+
#=============================================================================
# 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/bmesh/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py 2011-07-24 13:03:48 UTC (rev 38659)
@@ -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/bmesh/blender/build_files/cmake/example_scripts/cmake_linux_install.sh
===================================================================
--- branches/bmesh/blender/build_files/cmake/example_scripts/cmake_linux_install.sh 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/build_files/cmake/example_scripts/cmake_linux_install.sh 2011-07-24 13:03:48 UTC (rev 38659)
@@ -17,7 +17,7 @@
# cmake without copying files for fast rebuilds
# the files from svn will be used in place
-cmake ../blender -DWITH_INSTALL:BOOL=FALSE
+cmake ../blender
# make blender, will take some time
make
Modified: branches/bmesh/blender/build_files/cmake/macros.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/macros.cmake 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/build_files/cmake/macros.cmake 2011-07-24 13:03:48 UTC (rev 38659)
@@ -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, fixed in 2.8.5
+ if(CMAKE_COMPILER_IS_GNUCC)
+ if(NOT DARWIN)
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+ endif()
+ endif()
+
endmacro()
Modified: branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-07-24 13:03:48 UTC (rev 38659)
@@ -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/bmesh/blender/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.logic.rst 2011-07-24 12:36:14 UTC (rev 38658)
+++ branches/bmesh/blender/doc/python_api/rst/bge.logic.rst 2011-07-24 13:03:48 UTC (rev 38659)
@@ -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/bmesh/blender/doc/python_api/rst/bge.types.rst
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list