[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60199] branches/soc-2013-depsgraph_mt: Merging r60106 through r60197 from trunk into soc-2013-depsgraph_mt

Sergey Sharybin sergey.vfx at gmail.com
Tue Sep 17 15:50:26 CEST 2013


Revision: 60199
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60199
Author:   nazgul
Date:     2013-09-17 13:50:25 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
Merging r60106 through r60197 from trunk into soc-2013-depsgraph_mt

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

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
    branches/soc-2013-depsgraph_mt/build_files/scons/config/darwin-config.py
    branches/soc-2013-depsgraph_mt/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/soc-2013-depsgraph_mt/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/closure/bsdf.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/stdosl.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2013-depsgraph_mt/intern/cycles/render/attribute.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/film.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.h
    branches/soc-2013-depsgraph_mt/intern/cycles/render/shader.cpp
    branches/soc-2013-depsgraph_mt/intern/ghost/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/ghost/SConscript
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2013-depsgraph_mt/release/datafiles/startup.blend
    branches/soc-2013-depsgraph_mt/release/scripts/presets/keyconfig/maya.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/node.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/nodeitems_builtins.py
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_node.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_paint.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/versioning_defaults.c
    branches/soc-2013-depsgraph_mt/source/blender/compositor/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_NodeBase.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/animation/keyframing.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/blender/editors/curve/curve_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editcurve.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/curve/lorem.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mball.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_util.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_view3d.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_view2d.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_anim.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/view2d_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/metaball/mball_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_add.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/screen/area.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screen_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_select.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_view.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/util/crazyspace.c
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
    branches/soc-2013-depsgraph_mt/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_node_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2013-depsgraph_mt/source/blender/nodes/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_shader.h
    branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_static_types.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_api.h
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-depsgraph_mt/source/creator/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2013-depsgraph_mt/source/tests/bl_run_operators.py

Added Paths:
-----------
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/closure/bsdf_hair.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_hair_bsdf.osl
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
    branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_Debug.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_Debug.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editcurve_add.c
    branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c

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


Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-60105
   + /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-60197

Modified: branches/soc-2013-depsgraph_mt/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-09-17 13:22:42 UTC (rev 60198)
+++ branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-09-17 13:50:25 UTC (rev 60199)
@@ -317,9 +317,22 @@
 		set(OSX_SYSTEM unsupported)
 	endif()
 	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
+	
+	# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
+	# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
+	execute_process(COMMAND xcode-select --print-path  OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+	string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
+	message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
+	
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 	
+		if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+			string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
+			if(${DP_NAME} MATCHES Xcode5)
+				set(XCODE_VERSION 5)
+			endif()
+		endif()
+
 		##### cmake incompatibility with xcode  4.3 and higher #####
 		if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
 			message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
@@ -343,9 +356,10 @@
 	if(${XCODE_VERSION} VERSION_LESS 4.3)
 		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
 	else()
-		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
-		# absolute pathes are more foolproof here !
-		set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+		# note: xcode-select path could be ambigous, cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+		# so i use a selfcomposed bundlepath here  
+		set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+		message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
 		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
 		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
 	endif()

Modified: branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh	2013-09-17 13:22:42 UTC (rev 60198)
+++ branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh	2013-09-17 13:50:25 UTC (rev 60199)
@@ -25,10 +25,10 @@
 ARGS=$( \
 getopt \
 -o s:i:t:h \
---long source:,install:,tmp:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
+--long source:,install:,tmp:,threads:,help,with-all,with-opencollada,all-static,force-all,\
 force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\
 force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\
-skip-opencollada \
+skip-opencollada,required-numpy \
 -- "$@" \
 )
 
@@ -42,16 +42,13 @@
 # Do not install some optional, potentially conflicting libs by default...
 WITH_ALL=false
 
-# Do not yet enable osl, use --with-osl (or --with-all) option to try it.
-WITH_OSL=false
-
 # Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it.
 WITH_OPENCOLLADA=false
 
 # Try to link everything statically. Use this to produce portable versions of blender.
 ALL_STATIC=false
 
-THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
+THREADS=`cat /proc/cpuinfo | grep processor | wc -l`
 if [ -z "$THREADS" ]; then
   THREADS=1
 fi
@@ -63,7 +60,6 @@
 
 Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it).
 Full install: \$WITH_ALL (use --with-all option to enable it).
-Building OSL: \$WITH_OSL (use --with-osl option to enable it).
 Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
 All static linking: \$ALL_STATIC (use --all-static option to enable it).
 
@@ -96,10 +92,6 @@
         how your package system is set…).
         Note this option also implies all other (more specific) --with-foo options below.
 
-    --with-osl
-        Try to install or build the OpenShadingLanguage libraries (and their dependencies).
-        Still experimental!
-
     --with-opencollada
         Build and install the OpenCOLLADA libraries.
 
@@ -174,11 +166,15 @@
         Unconditionally skip OpenCOLLADA installation/building.
 
     --skip-ffmpeg
-        Unconditionally skip FFMpeg installation/building.\""
+        Unconditionally skip FFMpeg installation/building.
 
+    --required-numpy
+        Use this in case your distro features a valid python package, but no matching Numpy one.
+        It will force compilation of both python 3.3 and numpy 1.7.\""
+
 ##### Main Vars #####
 
-PYTHON_VERSION="3.3.0"
+PYTHON_VERSION="3.3.2"
 PYTHON_VERSION_MIN="3.3"
 PYTHON_SOURCE="http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.bz2"
 PYTHON_FORCE_REBUILD=false
@@ -189,6 +185,7 @@
 NUMPY_SOURCE="http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz"
 NUMPY_FORCE_REBUILD=false
 NUMPY_SKIP=false
+NUMPY_REQUIRED=false
 
 BOOST_VERSION="1.51.0"
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
@@ -239,7 +236,7 @@
 # Version??
 OPENCOLLADA_VERSION="1.3"
 OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
-OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
+OPENCOLLADA_REPO_UID="18da7f4109a8eafaa290a33f5550501cc4c8bae8"
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
@@ -322,9 +319,6 @@
     --with-all)
       WITH_ALL=true; shift; continue
     ;;
-    --with-osl)
-      WITH_OSL=true; shift; continue
-    ;;
     --with-opencollada)
       WITH_OPENCOLLADA=true; shift; continue
     ;;
@@ -408,6 +402,9 @@
     --skip-ffmpeg)
       FFMPEG_SKIP=true; shift; continue
     ;;
+    --required-numpy)
+      NUMPY_REQUIRED=true; shift; continue
+    ;;
     --)
       # no more arguments to parse
       break
@@ -424,7 +421,6 @@
 done
 
 if $WITH_ALL; then
-  WITH_OSL=true
   WITH_OPENCOLLADA=true
 fi
 
@@ -569,7 +565,7 @@
 
 compile_Python() {
   # To be changed each time we make edits that would modify the compiled result!
-  py_magic=0
+  py_magic=1
   _init_python
 
   # Clean install if needed!
@@ -593,7 +589,7 @@
 
     cd $_src
 
-    ./configure --prefix=$_inst --enable-ipv6 \
+    ./configure --prefix=$_inst --libdir=$_inst/lib --enable-ipv6 \
         --enable-loadable-sqlite-extensions --with-dbmliborder=bdb \
         --with-computed-gotos --with-pymalloc
 
@@ -633,11 +629,11 @@
 
 compile_Numpy() {
   # To be changed each time we make edits that would modify the compiled result!
-  py_magic=0
+  numpy_magic=0
   _init_numpy
 
   # Clean install if needed!
-  magic_compile_check numpy-$NUMPY_VERSION $py_magic
+  magic_compile_check numpy-$NUMPY_VERSION $numpy_magic
   if [ $? -eq 1 -o $NUMPY_FORCE_REBUILD == true ]; then
     clean_Numpy
   fi
@@ -668,7 +664,7 @@
       exit 1
     fi
 
-    magic_compile_set numpy-$NUMPY_VERSION $py_magic
+    magic_compile_set numpy-$NUMPY_VERSION $numpy_magic
 
     cd $CWD
     INFO "Done compiling Numpy-$NUMPY_VERSION!"
@@ -927,15 +923,14 @@
       ERROR "ILMBase-$ILMBASE_VERSION failed to compile, exiting"
       exit 1
     fi
+    cd $CWD
+    INFO "Done compiling ILMBase-$ILMBASE_VERSION!"
   else
     INFO "Own ILMBase-$ILMBASE_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib (and openexr), use the --force-openexr option."
   fi
 
   magic_compile_set ilmbase-$ILMBASE_VERSION $ilmbase_magic
-
-  cd $CWD
-  INFO "Done compiling ILMBase-$ILMBASE_VERSION!"
 }
 
 #### Build OpenEXR ####
@@ -1428,7 +1423,7 @@
 
 compile_LLVM() {
   # To be changed each time we make edits that would modify the compiled result!
-  llvm_magic=1
+  llvm_magic=2
   _init_llvm
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list