[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60459] branches/soc-2013-dingto: Merged revision(s) 60385-60458 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Tue Oct 1 01:00:48 CEST 2013
Revision: 60459
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60459
Author: dingto
Date: 2013-09-30 23:00:47 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
Merged revision(s) 60385-60458 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/GNUmakefile
branches/soc-2013-dingto/SConstruct
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/build_files/scons/config/darwin-config.py
branches/soc-2013-dingto/build_files/scons/tools/Blender.py
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-dingto/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2013-dingto/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2013-dingto/extern/libmv/libmv/multiview/homography.cc
branches/soc-2013-dingto/extern/libmv/libmv/multiview/homography.h
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
branches/soc-2013-dingto/extern/libmv/libmv-capi.h
branches/soc-2013-dingto/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
branches/soc-2013-dingto/intern/cycles/device/device_opencl.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_globals.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_primitive.h
branches/soc-2013-dingto/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
branches/soc-2013-dingto/intern/elbeem/CMakeLists.txt
branches/soc-2013-dingto/intern/elbeem/SConscript
branches/soc-2013-dingto/intern/elbeem/intern/attributes.h
branches/soc-2013-dingto/intern/elbeem/intern/controlparticles.h
branches/soc-2013-dingto/intern/elbeem/intern/isosurface.h
branches/soc-2013-dingto/intern/elbeem/intern/mvmcoords.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_blenderdumper.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_bsptree.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_geometryclass.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_geometrymodel.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_geometryobject.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_geometryshader.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_lighting.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_matrices.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_ray.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2013-dingto/intern/elbeem/intern/ntl_world.h
branches/soc-2013-dingto/intern/elbeem/intern/parametrizer.h
branches/soc-2013-dingto/intern/elbeem/intern/particletracer.cpp
branches/soc-2013-dingto/intern/elbeem/intern/particletracer.h
branches/soc-2013-dingto/intern/elbeem/intern/simulation_object.cpp
branches/soc-2013-dingto/intern/elbeem/intern/simulation_object.h
branches/soc-2013-dingto/intern/elbeem/intern/solver_class.h
branches/soc-2013-dingto/intern/elbeem/intern/solver_control.cpp
branches/soc-2013-dingto/intern/elbeem/intern/solver_control.h
branches/soc-2013-dingto/intern/elbeem/intern/solver_interface.cpp
branches/soc-2013-dingto/intern/elbeem/intern/solver_interface.h
branches/soc-2013-dingto/intern/elbeem/intern/solver_main.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2013-dingto/release/scripts/modules/bpy_types.py
branches/soc-2013-dingto/release/scripts/modules/rna_info.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-dingto/release/scripts/templates_py/ui_list.py
branches/soc-2013-dingto/source/blender/blenkernel/intern/boids.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/freestyle.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/gpencil.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/screen.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-dingto/source/blender/editors/animation/anim_filter.c
branches/soc-2013-dingto/source/blender/editors/curve/editfont.c
branches/soc-2013-dingto/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_bisect.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/object/object_edit.c
branches/soc-2013-dingto/source/blender/editors/object/object_group.c
branches/soc-2013-dingto/source/blender/editors/object/object_hook.c
branches/soc-2013-dingto/source/blender/editors/physics/particle_edit.c
branches/soc-2013-dingto/source/blender/editors/render/render_opengl.c
branches/soc-2013-dingto/source/blender/editors/screen/area.c
branches/soc-2013-dingto/source/blender/editors/screen/screendump.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/space_image/image_ops.c
branches/soc-2013-dingto/source/blender/editors/space_node/drawnode.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_view.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-dingto/source/blender/editors/space_text/space_text.c
branches/soc-2013-dingto/source/blender/editors/space_text/text_ops.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2013-dingto/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2013-dingto/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-dingto/source/blender/windowmanager/WM_keymap.h
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-dingto/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2013-dingto/source/blender/collada/version.conf
branches/soc-2013-dingto/source/tools/check_descriptions.py
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60384
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60458
Modified: branches/soc-2013-dingto/GNUmakefile
===================================================================
--- branches/soc-2013-dingto/GNUmakefile 2013-09-30 22:53:56 UTC (rev 60458)
+++ branches/soc-2013-dingto/GNUmakefile 2013-09-30 23:00:47 UTC (rev 60459)
@@ -182,6 +182,7 @@
@echo " * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
@echo " * check_spelling_osl - check for spelling errors (OSL only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
+ @echo " * check_descriptions - check for duplicate/invalid descriptions"
@echo ""
@echo "Utilities (not associated with building blender)"
@echo " * icons - updates PNG icons from SVG files."
@@ -313,6 +314,9 @@
check_spelling_osl:
cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/intern/cycles/kernel/shaders
+check_descriptions:
+ $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python $(BLENDER_DIR)/source/tools/check_descriptions.py
+
# -----------------------------------------------------------------------------
# Utilities
#
Modified: branches/soc-2013-dingto/SConstruct
===================================================================
--- branches/soc-2013-dingto/SConstruct 2013-09-30 22:53:56 UTC (rev 60458)
+++ branches/soc-2013-dingto/SConstruct 2013-09-30 23:00:47 UTC (rev 60459)
@@ -322,7 +322,10 @@
if env['WITH_BF_CYCLES_OSL'] == 1:
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
# we need 2 variants of passing the oslexec with the force_load option, string and list type atm
- env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
+ if env['CC'][:-2].endswith('4.8'):
+ env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-loslexec','-loslquery'])
+ else:
+ env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
# Trying to get rid of eventually clashes, we export some explicite as local symbols
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-09-30 22:53:56 UTC (rev 60458)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-09-30 23:00:47 UTC (rev 60459)
@@ -247,6 +247,8 @@
# FFMPEG optional libs.
VORBIS_USE=false
VORBIS_DEV=""
+OGG_USE=false
+OGG_DEV=""
THEORA_USE=false
THEORA_DEV=""
XVID_USE=false
@@ -1890,16 +1892,18 @@
# These libs should always be available in debian/ubuntu official repository...
OPENJPEG_DEV="libopenjpeg-dev"
VORBIS_DEV="libvorbis-dev"
+ OGG_DEV="libogg-dev"
THEORA_DEV="libtheora-dev"
_packages="gawk cmake cmake-curses-gui scons build-essential libjpeg-dev libpng-dev \
libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev \
libncurses5-dev libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV \
- libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV \
+ libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
libsdl1.2-dev libfftw3-dev patch bzip2"
OPENJPEG_USE=true
VORBIS_USE=true
+ OGG_USE=true
THEORA_USE=true
# Install newest libtiff-dev in debian/ubuntu.
@@ -2307,15 +2311,17 @@
# These libs should always be available in fedora/suse official repository...
OPENJPEG_DEV="openjpeg-devel"
VORBIS_DEV="libvorbis-devel"
+ OGG_DEV="libogg-devel"
THEORA_DEV="libtheora-devel"
_packages="gcc gcc-c++ make scons libtiff-devel freetype-devel libjpeg-devel\
libpng-devel libX11-devel libXi-devel wget ncurses-devel \
readline-devel $OPENJPEG_DEV openal-soft-devel \
- glew-devel yasm $THEORA_DEV $VORBIS_DEV patch"
+ glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch"
OPENJPEG_USE=true
VORBIS_USE=true
+ OGG_USE=true
THEORA_USE=true
if [ $RPM = "FEDORA" -o $RPM = "RHEL" ]; then
@@ -2643,13 +2649,15 @@
# These libs should always be available in arch official repository...
OPENJPEG_DEV="openjpeg"
VORBIS_DEV="libvorbis"
+ OGG_DEV="libogg"
THEORA_DEV="libtheora"
_packages="base-devel scons cmake libxi glew libpng libtiff wget openal \
- $OPENJPEG_DEV $VORBIS_DEV $THEORA_DEV yasm sdl fftw"
+ $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl fftw"
OPENJPEG_USE=true
VORBIS_USE=true
+ OGG_USE=true
THEORA_USE=true
if $WITH_ALL; then
@@ -2912,6 +2920,10 @@
_packages="$_packages $VORBIS_DEV"
fi
+ if $OGG_USE; then
+ _packages="$_packages $OGG_DEV"
+ fi
+
if $XVID_USE; then
_packages="$_packages $XVID_DEV"
fi
Modified: branches/soc-2013-dingto/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/config/darwin-config.py 2013-09-30 22:53:56 UTC (rev 60458)
+++ branches/soc-2013-dingto/build_files/scons/config/darwin-config.py 2013-09-30 23:00:47 UTC (rev 60459)
@@ -113,7 +113,7 @@
#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
# if your compiler does not have accurate suffix you may have to enable it by hand !
-if CC[:-2].endswith('4.6'):
+if CC[:-2].endswith('4.6') or CC[:-2].endswith('4.8'):
WITH_BF_OPENMP = True # multithreading for fluids, cloth, sculpt and smoke
else:
WITH_BF_OPENMP = False
Modified: branches/soc-2013-dingto/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/tools/Blender.py 2013-09-30 22:53:56 UTC (rev 60458)
+++ branches/soc-2013-dingto/build_files/scons/tools/Blender.py 2013-09-30 23:00:47 UTC (rev 60459)
@@ -683,16 +683,24 @@
commands.getoutput(cmd)
cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
commands.getoutput(cmd)
- if env['CC'][:-2].endswith('4.6'): # for correct errorhandling with gcc 4.6.x we need the gcc.dylib to link, thus distribute in app-bundle
+ if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'): # for correct errorhandling with gcc 4.6/4.8.x we need the gcc.dylib and gomp.dylib to link, thus distribute in app-bundle
cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
commands.getoutput(cmd)
instname = env['BF_CXX']
- cmd = 'ditto --arch %s %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(osxarch, instname, installdir, binary)
+ cmd = 'ditto --arch %s %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(osxarch, instname, installdir, binary) # copy libgcc
commands.getoutput(cmd)
- cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
+ cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary) # change id of libgcc
commands.getoutput(cmd)
- cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary)
+ cmd = 'ditto --arch %s %s/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/lib/'%(osxarch, instname, installdir, binary) # copy libgomp
commands.getoutput(cmd)
+ cmd = 'install_name_tool -id @executable_path/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/lib/libgomp.1.dylib'%(installdir, binary) # change id of libgomp
+ commands.getoutput(cmd)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list