[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57534] branches/soc-2013-cycles_mblur: Merged trunk into branch at r57533.

Gavin Howard gavin.d.howard at gmail.com
Tue Jun 18 00:31:53 CEST 2013


Revision: 57534
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57534
Author:   gdh
Date:     2013-06-17 22:31:52 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Merged trunk into branch at r57533.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/CMakeLists.txt
    branches/soc-2013-cycles_mblur/SConstruct
    branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindOpenEXR.cmake
    branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
    branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
    branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg
    branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_scene.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_transform.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_icons.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_extrude.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/application/AppCanvas.cpp
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/Silhouette.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-cycles_mblur/source/creator/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57485
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57533

Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-06-17 19:49:06 UTC (rev 57533)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-06-17 22:31:52 UTC (rev 57534)
@@ -1124,26 +1124,22 @@
 				${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
 				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
-			set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
 			set(OPENCOLLADA_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+				${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+				${OPENCOLLADA}/lib/opencollada/xml.lib
+				${OPENCOLLADA}/lib/opencollada/buffer.lib
+				${OPENCOLLADA}/lib/opencollada/ftoa.lib
+				${OPENCOLLADA}/lib/opencollada/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+				${OPENCOLLADA}/lib/opencollada/pcre.lib
 			)
-			
-			unset(OPENCOLLADA_LIBPATH)
-			
 		endif()
 
 		if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			set_lib_path(OPENEXR "openexr")
+			set(OPENEXR ${LIBDIR}/openexr)
 			set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1199,18 +1195,11 @@
 		endif()
 
 		if(WITH_PYTHON)
-			# normally cached but not since we include them with blender
-			if(MSVC10)
-				set(PYTHON_VERSION 3.3) # CACHE STRING)
-			else()
-				set(PYTHON_VERSION 3.3) # CACHE STRING)
-			endif()
+			set(PYTHON_VERSION 3.3) # CACHE STRING)
 
-			set_lib_path(PYTHON "python")
 			string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 			# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
 			set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
-			# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
 			unset(_PYTHON_VERSION_NO_DOTS)
 
 			# Shared includes for both vc2008 and vc2010
@@ -1228,10 +1217,6 @@
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
 				set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
-			elseif(MSVC10)
-				set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
-				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
-				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2084,13 +2069,6 @@
 
 endif()
 
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
-	if(WITH_OPENCOLLADA)
-		message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
-	endif()
-endif()
-
 # ensure python header is found since detection can fail, this could happen
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.

Modified: branches/soc-2013-cycles_mblur/SConstruct
===================================================================
--- branches/soc-2013-cycles_mblur/SConstruct	2013-06-17 19:49:06 UTC (rev 57533)
+++ branches/soc-2013-cycles_mblur/SConstruct	2013-06-17 22:31:52 UTC (rev 57534)
@@ -148,9 +148,9 @@
             btools.SetupSpawn(env)
 else:
     if bitness==64 and platform=='win32':
-        env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+        env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
     else:
-        env = BlenderEnvironment(ENV = os.environ)
+        env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
 
 if not env:
     print "Could not create a build environment"

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindOpenEXR.cmake	2013-06-17 19:49:06 UTC (rev 57533)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindOpenEXR.cmake	2013-06-17 22:31:52 UTC (rev 57534)
@@ -52,11 +52,11 @@
 
 FIND_PATH(OPENEXR_INCLUDE_DIR
   NAMES
-    ImfXdr.h
+    OpenEXR/ImfXdr.h
   HINTS
     ${_openexr_SEARCH_DIRS}
   PATH_SUFFIXES
-    include/OpenEXR
+    include
 )
 
 SET(_openexr_LIBRARIES)
@@ -82,7 +82,8 @@
 
 IF(OPENEXR_FOUND)
   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
+  # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
+  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
 ENDIF()
 
 MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake	2013-06-17 19:49:06 UTC (rev 57533)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake	2013-06-17 22:31:52 UTC (rev 57534)
@@ -751,18 +751,7 @@
 	endif()
 endfunction()
 
-macro(set_lib_path
-		lvar
-		lproj)
 
-	if(MSVC10)
-		set(${lvar} ${LIBDIR}/${lproj}/vc2010)
-	else()
-		set(${lvar} ${LIBDIR}/${lproj})
-	endif()
-endmacro()
-
-
 macro(data_to_c
       file_from file_to
       list_to_add)

Modified: branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py	2013-06-17 19:49:06 UTC (rev 57533)
+++ branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py	2013-06-17 22:31:52 UTC (rev 57534)
@@ -233,8 +233,6 @@
             stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env=env)
         data, err = proc.communicate()
         rv = proc.wait()
-        if data:
-            print(data)
         if err:
             print(err)
         return rv

Modified: branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg
===================================================================
--- branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg	2013-06-17 19:49:06 UTC (rev 57533)
+++ branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg	2013-06-17 22:31:52 UTC (rev 57534)
@@ -26,6 +26,30 @@
      id="title49470">Blender icons v. 2.5.08</title>
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient18214">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop18216" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop18218" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient18205">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop18207" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop18210" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 320 : 1"
@@ -26201,6 +26225,708 @@
          offset="1"
          id="stop321-54" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37829-7"
+       id="linearGradient37089-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9999993,0,0,-0.9821923,165.4,716.20935)"
+       x1="261.17639"
+       y1="247.85646"
+       x2="253.86414"
+       y2="288.70752" />
+    <linearGradient
+       id="linearGradient37829-7">
+      <stop
+         id="stop37831-4"
+         offset="0"
+         style="stop-color:#3d361a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d1c595;stop-opacity:1;"
+         offset="0.5"
+         id="stop37833-0" />
+      <stop
+         id="stop37835-9"

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list