Revision: 37529
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37529
Author: psy-fi
Date: 2011-06-15 22:20:04 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
merge with trunk -r37527
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37527
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2011-onion/build_files/cmake/macros.cmake
branches/soc-2011-onion/doc/python_api/rst/bge.logic.rst
branches/soc-2011-onion/doc/python_api/rst/bge.types.rst
branches/soc-2011-onion/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/source/blender/blenkernel/BKE_action.h
branches/soc-2011-onion/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-onion/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-onion/source/blender/blenkernel/depsgraph_private.h
branches/soc-2011-onion/source/blender/blenkernel/intern/action.c
branches/soc-2011-onion/source/blender/blenkernel/intern/blender.c
branches/soc-2011-onion/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-onion/source/blender/blenkernel/intern/displist.c
branches/soc-2011-onion/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion/source/blender/blenkernel/intern/sca.c
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/blenpluginapi/iff.h
branches/soc-2011-onion/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-onion/source/blender/collada/LightExporter.cpp
branches/soc-2011-onion/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion/source/blender/editors/interface/resources.c
branches/soc-2011-onion/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-onion/source/blender/editors/object/object_add.c
branches/soc-2011-onion/source/blender/editors/object/object_bake.c
branches/soc-2011-onion/source/blender/editors/object/object_relations.c
branches/soc-2011-onion/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-onion/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-onion/source/blender/editors/space_node/node_draw.c
branches/soc-2011-onion/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion/source/blender/editors/space_node/node_intern.h
branches/soc-2011-onion/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-onion/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-onion/source/blender/editors/transform/transform_generics.c
branches/soc-2011-onion/source/blender/editors/util/undo.c
branches/soc-2011-onion/source/blender/gpu/GPU_draw.h
branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-onion/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-onion/source/blender/imbuf/intern/rectop.c
branches/soc-2011-onion/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-onion/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-onion/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2011-onion/source/blender/render/intern/source/render_texture.c
branches/soc-2011-onion/source/blender/render/intern/source/rendercore.c
branches/soc-2011-onion/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-onion/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-onion/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/KX_CameraActuator.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-37451
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37527
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-06-15 22:14:53 UTC (rev
37528)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-06-15 22:20:04 UTC (rev
37529)
@@ -224,9 +224,6 @@
set(WITH_HEADLESS ON)
endif()
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -235,6 +232,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 "")
@@ -343,23 +343,8 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
- mark_as_advanced(OPENEXR)
- find_path(OPENEXR_INC
- ImfXdr.h
- PATHS
- ${OPENEXR}/include/OpenEXR
- /usr/local/include/OpenEXR
- /sw/include/OpenEXR
- /opt/local/include/OpenEXR
- /opt/csw/include/OpenEXR
- /opt/include/OpenEXR
- )
- mark_as_advanced(OPENEXR_INC)
-
- set(OPENEXR_LIB Half IlmImf Iex Imath)
-
- if(NOT OPENEXR_INC)
+ find_package(OpenEXR) # our own module
+ if(NOT OPENEXR_FOUND)
set(WITH_IMAGE_OPENEXR OFF)
endif()
endif()
@@ -644,10 +629,7 @@
endif()
if(WITH_IMAGE_OPENEXR)
- if(MSVC80)
- set(MSVC_LIB _vs2005)
- set(MSVC_INC)
- elseif(MSVC90)
+ if(MSVC90)
set(MSVC_LIB _vs2008)
set(MSVC_INC)
elseif(MSVC10)
@@ -657,11 +639,24 @@
set(MSVC_LIB msvc)
set(MSVC_INC)
endif()
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set(OPENEXR_LIBRARIES
+ ${OPENEXR_LIBPATH}/Iex.lib
+ ${OPENEXR_LIBPATH}/Half.lib
+ ${OPENEXR_LIBPATH}/IlmImf.lib
+ ${OPENEXR_LIBPATH}/Imath.lib
+ ${OPENEXR_LIBPATH}/IlmThread.lib
+ )
set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
- set(OPENEXR_INC ${OPENEXR_INCUDE}/
${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
+ set(OPENEXR_INCLUDE_DIRS
+ ${OPENEXR_INCUDE}
+ ${OPENEXR_INCUDE}/IlmImf
+ ${OPENEXR_INCUDE}/Iex
+ ${OPENEXR_INCUDE}/Imath
+ )
+ unset(OPENEXR_INCUDE)
+ unset(OPENEXR_LIBPATH)
endif()
if(WITH_IMAGE_TIFF)
@@ -760,8 +755,8 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/gcc/openexr)
- set(OPENEXR_INC ${OPENEXR}/include
${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIB Half IlmImf Imath IlmThread)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
# TODO, gives linking errors, force off
@@ -893,8 +888,8 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
- set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+ set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
Modified: branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
2011-06-15 22:14:53 UTC (rev 37528)
+++ branches/soc-2011-onion/build_files/cmake/FindPythonLibsUnix.cmake
2011-06-15 22:20:04 UTC (rev 37529)
@@ -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-onion/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-06-15
22:14:53 UTC (rev 37528)
+++ branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-06-15
22:20:04 UTC (rev 37529)
@@ -150,15 +150,22 @@
target)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
${PLATFORM_LINKFLAGS} ")
- target_link_libraries(${target} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}
${LLIBS})
+ target_link_libraries(${target}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${LLIBS})
# since we are using the local libs for python when compiling msvc
projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
target_link_libraries(${target} ${PYTHON_LINKFLAGS})
if(WIN32 AND NOT UNIX)
- target_link_libraries(${target} debug
${PYTHON_LIBRARY}_d)
- target_link_libraries(${target} optimized
${PYTHON_LIBRARY})
+ target_link_libraries(${target}
+ debug ${PYTHON_LIBRARY}_d
+ optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(${target} ${PYTHON_LIBRARY})
endif()
@@ -168,8 +175,12 @@
target_link_libraries(${target} ${GLEW_LIBRARY})
endif()
- target_link_libraries(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES}
${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
- target_link_libraries(${target} ${FREETYPE_LIBRARY})
+ target_link_libraries(${target}
+ ${OPENGL_glu_LIBRARY}
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${FREETYPE_LIBRARY})
if(WITH_INTERNATIONAL)
target_link_libraries(${target} ${GETTEXT_LIB})
@@ -205,13 +216,16 @@
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_LIBRARIES})
+ string(REGEX REPLACE ".lib$" "_d.lib"
_LOOP_VAR_DEBUG ${_LOOP_VAR})
+ target_link_libraries(${target}
+ debug ${_LOOP_VAR_DEBUG}
+ optimized ${_LOOP_VAR})
endforeach()
unset(_LOOP_VAR)
+ unset(_LOOP_VAR_DEBUG)
else()
- target_link_libraries(${target} ${OPENEXR_LIB})
+ target_link_libraries(${target} ${OPENEXR_LIBRARIES})
endif()
endif()
if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
@@ -223,20 +237,24 @@
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})
+ target_link_libraries(${target}
+ debug ${_LOOP_VAR}_d
+ optimized ${_LOOP_VAR})
endforeach()
unset(_LOOP_VAR)
- target_link_libraries(${target} debug ${PCRE_LIB}_d)
- target_link_libraries(${target} optimized ${PCRE_LIB})
+ target_link_libraries(${target}
+ debug ${PCRE_LIB}_d
+ optimized ${PCRE_LIB})
if(EXPAT_LIB)
- target_link_libraries(${target} debug
${EXPAT_LIB}_d)
- target_link_libraries(${target} optimized
${EXPAT_LIB})
+ target_link_libraries(${target}
+ debug ${EXPAT_LIB}_d
+ optimized ${EXPAT_LIB})
endif()
else()
- target_link_libraries(${target} ${OPENCOLLADA_LIB})
- target_link_libraries(${target} ${PCRE_LIB})
- target_link_libraries(${target} ${EXPAT_LIB})
+ target_link_libraries(${target}
+ ${OPENCOLLADA_LIB}
+ ${PCRE_LIB}
+ ${EXPAT_LIB})
endif()
endif()
if(WITH_MEM_JEMALLOC)
@@ -484,8 +502,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-onion/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2011-onion/doc/python_api/rst/bge.logic.rst 2011-06-15
22:14:53 UTC (rev 37528)
+++ branches/soc-2011-onion/doc/python_api/rst/bge.logic.rst 2011-06-15
22:20:04 UTC (rev 37529)
@@ -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-onion/doc/python_api/rst/bge.types.rst
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
