[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60240] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Thu Sep 19 22:11:24 CEST 2013
Revision: 60240
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60240
Author: gdh
Date: 2013-09-19 20:11:23 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60174 to r60238.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60174
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60238
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.props.5.py
branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-cycles_mblur/doc/python_api/rst/bge.logic.rst
branches/soc-2013-cycles_mblur/doc/python_api/sphinx_doc_gen.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
branches/soc-2013-cycles_mblur/intern/cycles/bvh/bvh_build.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_passes.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-cycles_mblur/intern/cycles/render/shader.cpp
branches/soc-2013-cycles_mblur/release/datafiles/preview_cycles.blend
branches/soc-2013-cycles_mblur/release/datafiles/startup.blend
branches/soc-2013-cycles_mblur/release/scripts/modules/bpy/path.py
branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_types.py
branches/soc-2013-cycles_mblur/release/scripts/modules/rna_info.py
branches/soc-2013-cycles_mblur/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_ocean.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/versioning_defaults.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_Debug.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ImageNode.h
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_object.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.h
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/makesrna/RNA_access.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
branches/soc-2013-cycles_mblur/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-cycles_mblur/source/blender/python/generic/py_capi_utils.c
branches/soc-2013-cycles_mblur/source/blender/python/generic/py_capi_utils.h
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_driver.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_interface.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_props.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna.c
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/gameengine/Ketsji/KX_TouchEventManager.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
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-60173
+ /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-60238
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-19 19:53:48 UTC (rev 60239)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-09-19 20:11:23 UTC (rev 60240)
@@ -48,7 +48,7 @@
# Try to link everything statically. Use this to produce portable versions of blender.
ALL_STATIC=false
-THREADS=`cat /proc/cpuinfo | grep siblings | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
+THREADS=`cat /proc/cpuinfo | grep processor | wc -l`
if [ -z "$THREADS" ]; then
THREADS=1
fi
@@ -174,7 +174,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
@@ -193,7 +193,6 @@
BOOST_VERSION_MIN="1.49"
BOOST_FORCE_REBUILD=false
BOOST_SKIP=false
-_need_boost_ldconfig=false
OCIO_VERSION="1.0.7"
OCIO_SOURCE="https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION"
@@ -209,14 +208,12 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
-_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
OIIO_VERSION_MIN="1.1"
OIIO_FORCE_REBUILD=false
OIIO_SKIP=false
-_need_oiio_ldconfig=false
LLVM_VERSION="3.1"
LLVM_VERSION_MIN="3.0"
@@ -550,6 +547,17 @@
ln -s $_inst $_inst_shortcut
}
+# ldconfig
+run_ldconfig() {
+ _lib_path="$INST/$1/lib"
+ _ldonf_path="/etc/ld.so.conf.d/$1.conf"
+ INFO ""
+ INFO "Running ldconfig for $1..."
+ sudo sh -c "echo \"$INST/boost/lib\" > /etc/ld.so.conf.d/boost.conf"
+ sudo /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
+ INFO ""
+}
+
#### Build Python ####
_init_python() {
_src=$SRC/Python-$PYTHON_VERSION
@@ -565,7 +573,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!
@@ -589,7 +597,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
@@ -629,11 +637,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
@@ -664,7 +672,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!"
@@ -739,7 +747,7 @@
fi
# Just always run it, much simpler this way!
- _need_boost_ldconfig=true
+ run_ldconfig "boost"
}
#### Build OCIO ####
@@ -923,15 +931,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 ####
@@ -1143,7 +1150,7 @@
_with_built_openexr=true
# Just always run it, much simpler this way!
- _need_openexr_ldconfig=true
+ run_ldconfig "openexr"
}
#### Build OIIO ####
@@ -1406,7 +1413,7 @@
fi
# Just always run it, much simpler this way!
- _need_oiio_ldconfig=true
+ run_ldconfig "oiio"
}
#### Build LLVM ####
@@ -2002,7 +2009,6 @@
INFO " Use --required-numpy to force building of both Python and numpy."
fi
fi
- clean_Python
else
_do_compile=true
fi
@@ -2015,6 +2021,8 @@
else
compile_Numpy
fi
+ else
+ clean_Python
fi
fi
@@ -2419,7 +2427,6 @@
INFO " Use --required-numpy to force building of both Python and numpy."
fi
fi
- clean_Python
else
_do_compile=true
fi
@@ -2432,6 +2439,8 @@
else
compile_Numpy
fi
+ else
+ clean_Python
fi
fi
@@ -2711,7 +2720,6 @@
fi
fi
fi
- clean_Python
else
_do_compile=true
fi
@@ -2724,6 +2732,8 @@
else
compile_Numpy
fi
+ else
+ clean_Python
fi
fi
@@ -2962,6 +2972,12 @@
fi
fi
+ if [ -d $INST/python-$PYTHON_VERSION_MIN ]; then
+ _1="-D PYTHON_ROOT_DIR=$INST/python-$PYTHON_VERSION_MIN"
+ INFO " $_1"
+ _buildargs="$_buildargs $_1"
+ fi
+
if [ -d $INST/boost ]; then
_1="-D BOOST_ROOT=$INST/boost"
_2="-D Boost_NO_SYSTEM_PATHS=ON"
@@ -3142,20 +3158,6 @@
exit 1
fi
-INFO ""
-INFO "Running ldconfig..."
-if [ $_need_boost_ldconfig == true ]; then
- sudo sh -c "echo \"$INST/boost/lib\" > /etc/ld.so.conf.d/boost.conf"
-fi
-if [ $_need_oiio_ldconfig == true ]; then
- sudo sh -c "echo \"$INST/oiio/lib\" > /etc/ld.so.conf.d/oiio.conf"
-fi
-if [ $_need_openexr_ldconfig == true ]; then
- sudo sh -c "echo \"$INST/openexr/lib\" > /etc/ld.so.conf.d/openexr.conf"
-fi
-sudo /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
-INFO ""
-
print_info | tee BUILD_NOTES.txt
INFO ""
INFO "This information has been written to BUILD_NOTES.txt"
Modified: branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.props.5.py
===================================================================
--- branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.props.5.py 2013-09-19 19:53:48 UTC (rev 60239)
+++ branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.props.5.py 2013-09-19 20:11:23 UTC (rev 60240)
@@ -1,6 +1,6 @@
"""
Get/Set Example
-++++++++++++++
++++++++++++++++
Get/Set functions can be used for boolean, int, float, string and enum properties.
If these callbacks are defined the property will not be stored in the ID properties
Modified: branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.1.py
===================================================================
--- branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.1.py 2013-09-19 19:53:48 UTC (rev 60239)
+++ branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.1.py 2013-09-19 20:11:23 UTC (rev 60240)
@@ -1,6 +1,7 @@
"""
Basic UIList Example
-+++++++++++++++++++
+++++++++++++++++++++
+
This script is the UIList subclass used to show material slots, with a bunch of additional commentaries.
Notice the name of the class, this naming convention is similar as the one for panels or menus.
@@ -73,8 +74,8 @@
# with no custom draw code, use "UI_UL_list").
layout.template_list("MATERIAL_UL_matslots_example", "", obj, "material_slots", obj, "active_material_index")
- # The second one can usually be left as an empty string. It's an additional ID used to distinguish lists in case you
- # use the same list several times in a given area.
+ # The second one can usually be left as an empty string.
+ # It's an additional ID used to distinguish lists in case you use the same list several times in a given area.
layout.template_list("MATERIAL_UL_matslots_example", "compact", obj, "material_slots",
obj, "active_material_index", type='COMPACT')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list