[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60174] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Mon Sep 16 20:51:37 CEST 2013
Revision: 60174
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60174
Author: gdh
Date: 2013-09-16 18:51:37 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60133 to r60173.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60133
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60173
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.h
branches/soc-2013-cycles_mblur/intern/ghost/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-cycles_mblur/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframing.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/editors/curve/curve_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/lorem.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mball.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_object.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_util.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_view3d.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_view2d.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_anim.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_view.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/util/crazyspace.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-cycles_mblur/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_mask_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2013-cycles_mblur/source/blender/nodes/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_shader.h
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_static_types.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/tests/bl_run_operators.py
Added Paths:
-----------
branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_hair_bsdf.osl
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
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_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-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/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:57388-60132
+ /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-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/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:57388-60173
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-09-16 18:14:04 UTC (rev 60173)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-09-16 18:51:37 UTC (rev 60174)
@@ -326,12 +326,15 @@
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})
- 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()
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
Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-09-16 18:14:04 UTC (rev 60173)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-09-16 18:51:37 UTC (rev 60174)
@@ -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 siblings | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
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,8 +166,12 @@
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"
@@ -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
@@ -1428,7 +1424,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
# Clean install if needed!
@@ -1533,7 +1529,7 @@
compile_OSL() {
# To be changed each time we make edits that would modify the compiled result!
- osl_magic=10
+ osl_magic=11
_init_osl
# Clean install if needed!
@@ -1591,6 +1587,7 @@
cmake_d="$cmake_d -D OPENIMAGEIOHOME=$INST/oiio"
fi
+ INFO "$LLVM_VERSION_FOUND"
if [ ! -z $LLVM_VERSION_FOUND ]; then
cmake_d="$cmake_d -D LLVM_VERSION=$LLVM_VERSION_FOUND"
if [ -d $INST/llvm ]; then
@@ -1635,7 +1632,7 @@
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=7
+ opencollada_magic=8
_init_opencollada
# Clean install if needed!
@@ -1985,6 +1982,7 @@
if $PYTHON_SKIP; then
INFO "WARNING! Skipping Python installation, as requested..."
else
+ _do_compile=false
check_package_DEB python$PYTHON_VERSION_MIN-dev
if [ $? -eq 0 ]; then
install_packages_DEB python$PYTHON_VERSION_MIN-dev
@@ -1995,12 +1993,21 @@
check_package_DEB python$PYTHON_VERSION_MIN-numpy
if [ $? -eq 0 ]; then
install_packages_DEB python$PYTHON_VERSION_MIN-numpy
+ elif $NUMPY_REQUIRED; then
+ INFO "WARNING! Valid python package but no valid numpy package!"
+ INFO " Building both Python and Numpy from sources!"
+ _do_compile=true
else
- INFO "WARNING! Sorry, using python package but no numpy package available!"
+ INFO "WARNING! Sorry, using python package but no valid numpy package available!"
+ INFO " Use --required-numpy to force building of both Python and numpy."
fi
fi
clean_Python
else
+ _do_compile=true
+ fi
+
+ if $_do_compile; then
compile_Python
INFO ""
if $NUMPY_SKIP; then
@@ -2074,48 +2081,38 @@
fi
fi
- if $WITH_OSL; then
- have_llvm=false
+ have_llvm=false
- if $LLVM_SKIP; then
- INFO "WARNING! Skipping LLVM installation, as requested (this also implies skipping OSL!)..."
+ if $LLVM_SKIP; then
+ INFO "WARNING! Skipping LLVM installation, as requested (this also implies skipping OSL!)..."
+ else
+ INFO ""
+ check_package_version_ge_DEB llvm-dev $LLVM_VERSION_MIN
+ if [ $? -eq 0 ]; then
+ install_packages_DEB llvm-dev clang
+ have_llvm=true
+ LLVM_VERSION_FOUND="" # Using default one, no need to specify it!
+ clean_LLVM
else
+ install_packages_DEB libffi-dev
+ # LLVM can't find the debian ffi header dir
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list