[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37516] branches/soc-2011-salad: Merging r37481 through r37515 from trunk into soc-2011-salad

Sergey Sharybin g.ulairi at gmail.com
Wed Jun 15 19:38:33 CEST 2011


Revision: 37516
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37516
Author:   nazgul
Date:     2011-06-15 17:38:33 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
Merging r37481 through r37515 from trunk into soc-2011-salad

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

Modified Paths:
--------------
    branches/soc-2011-salad/CMakeLists.txt
    branches/soc-2011-salad/build_files/cmake/macros.cmake
    branches/soc-2011-salad/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py
    branches/soc-2011-salad/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_action.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_displist.h
    branches/soc-2011-salad/source/blender/blenkernel/depsgraph_private.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/action.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/object.c
    branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-salad/source/blender/blenpluginapi/iff.h
    branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-salad/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-salad/source/blender/editors/object/object_add.c
    branches/soc-2011-salad/source/blender/editors/object/object_bake.c
    branches/soc-2011-salad/source/blender/editors/object/object_relations.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-salad/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-salad/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/soc-2011-salad/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-salad/source/blender/imbuf/intern/rectop.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-salad/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2011-salad/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-salad/source/gameengine/Converter/BL_ActionActuator.cpp

Added Paths:
-----------
    branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake

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-37485
/trunk/blender:36834-37480
   + /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-37485
/trunk/blender:36834-37515

Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt	2011-06-15 17:23:08 UTC (rev 37515)
+++ branches/soc-2011-salad/CMakeLists.txt	2011-06-15 17:38:33 UTC (rev 37516)
@@ -346,23 +346,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()
@@ -647,10 +632,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)
@@ -660,11 +642,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)
@@ -763,8 +758,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
@@ -896,8 +891,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()
 

Copied: branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake (from rev 37515, trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake)
===================================================================
--- branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake	                        (rev 0)
+++ branches/soc-2011-salad/build_files/cmake/Modules/FindOpenEXR.cmake	2011-06-15 17:38:33 UTC (rev 37516)
@@ -0,0 +1,76 @@
+# - Find OpenEXR library (copied from FindTIFF.cmake, v 2.8.5)
+# Find the native OpenEXR includes and library
+# This module defines
+#  OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
+#                        OPENEXR_INCLUDE_DIR is found.
+#  OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
+#  OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
+#                    This can also be an environment variable.
+#  OPENEXR_FOUND, If false, do not try to use OpenEXR.
+# also defined, but not for general use are
+#  OPENEXR_LIBRARY, where to find the OpenEXR library.
+
+#=============================================================================
+# Copyright 2002-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# If OPENEXR_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
+  SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
+ENDIF()
+
+SET(_openexr_FIND_COMPONENTS
+  Half
+  IlmImf
+  Iex
+  Imath
+)
+
+SET(_openexr_SEARCH_DIRS
+  ${OPENEXR_ROOT_DIR}
+  /usr/local
+  /opt/csw
+)
+
+FIND_PATH(OPENEXR_INCLUDE_DIR ImfXdr.h
+  HINTS
+    ${_openexr_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include/OpenEXR
+)
+
+SET(_openexr_LIBRARIES)
+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+  FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT}
+      HINTS ${_openexr_SEARCH_DIRS}
+      PATH_SUFFIXES lib
+      )
+  LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
+ENDFOREACH()
+
+# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR  DEFAULT_MSG
+    ${_openexr_LIBRARIES} OPENEXR_INCLUDE_DIR)
+
+IF(OPENEXR_FOUND)
+  SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
+  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
+ENDIF(OPENEXR_FOUND)
+
+MARK_AS_ADVANCED(
+  ${_openexr_LIBRARIES}
+  OPENEXR_INCLUDE_DIR
+)

Modified: branches/soc-2011-salad/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/macros.cmake	2011-06-15 17:23:08 UTC (rev 37515)
+++ branches/soc-2011-salad/build_files/cmake/macros.cmake	2011-06-15 17:38:33 UTC (rev 37516)
@@ -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)

Modified: branches/soc-2011-salad/release/scripts/modules/bpy_extras/view3d_utils.py
===================================================================
--- branches/soc-2011-salad/release/scripts/modules/bpy_extras/view3d_utils.py	2011-06-15 17:23:08 UTC (rev 37515)
+++ branches/soc-2011-salad/release/scripts/modules/bpy_extras/view3d_utils.py	2011-06-15 17:38:33 UTC (rev 37516)
@@ -114,6 +114,8 @@
     :return: 2d location
     :rtype: :class:`Vector`
     """
+    from mathutils import Vector
+

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list