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

Gavin Howard gavin.d.howard at gmail.com
Tue Oct 1 01:48:31 CEST 2013 

Revision: 60461
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60461
Author:   gdh
Date:     2013-09-30 23:48:31 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60408 to r60460.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/GNUmakefile
    branches/soc-2013-cycles_mblur/SConstruct
    branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py
    branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py
    branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.2.py
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.h
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.cc
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/homography.h
    branches/soc-2013-cycles_mblur/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
    branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc
    branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.h
    branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi_stub.cc
    branches/soc-2013-cycles_mblur/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/stdosl.h
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowCocoa.h
    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/uvcalc_lightmap.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2013-cycles_mblur/release/scripts/templates_py/ui_list.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/freestyle.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/idprop.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/rigidbody.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/screen.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_edgenet.c
    branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_filter.c
    branches/soc-2013-cycles_mblur/source/blender/editors/curve/editfont.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/view2d_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_bisect.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_group.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_hook.c
    branches/soc-2013-cycles_mblur/source/blender/editors/physics/particle_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_shading.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.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_tree.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_modifier.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_view.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_text/space_text.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_ops.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_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/soc-2013-cycles_mblur/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/shadbuf.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_window.c

Added Paths:
-----------
    branches/soc-2013-cycles_mblur/source/blender/collada/version.conf
    branches/soc-2013-cycles_mblur/source/tools/check_descriptions.py

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    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-60407
   + /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-60460

Modified: branches/soc-2013-cycles_mblur/GNUmakefile
===================================================================
--- branches/soc-2013-cycles_mblur/GNUmakefile	2013-09-30 23:02:29 UTC (rev 60460)
+++ branches/soc-2013-cycles_mblur/GNUmakefile	2013-09-30 23:48:31 UTC (rev 60461)
@@ -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-cycles_mblur/SConstruct
===================================================================
--- branches/soc-2013-cycles_mblur/SConstruct	2013-09-30 23:02:29 UTC (rev 60460)
+++ branches/soc-2013-cycles_mblur/SConstruct	2013-09-30 23:48:31 UTC (rev 60461)
@@ -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-cycles_mblur/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py	2013-09-30 23:02:29 UTC (rev 60460)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py	2013-09-30 23:48:31 UTC (rev 60461)
@@ -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-cycles_mblur/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py	2013-09-30 23:02:29 UTC (rev 60460)
+++ branches/soc-2013-cycles_mblur/build_files/scons/tools/Blender.py	2013-09-30 23:48:31 UTC (rev 60461)
@@ -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)
+        cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgomp.1.dylib'%(instname, installdir, binary) # change ref to 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) # change ref to libgcc ( blender )
+        commands.getoutput(cmd)
+        cmd = 'install_name_tool -change %s/lib/libgomp.1.dylib  @executable_path/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary) # change ref to libgomp ( blender )
+        commands.getoutput(cmd)
 
 # extract copy system python, be sure to update other build systems
 # when making changes to the files that are copied.

Modified: branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.2.py
===================================================================
--- branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.2.py	2013-09-30 23:02:29 UTC (rev 60460)
+++ branches/soc-2013-cycles_mblur/doc/python_api/examples/bpy.types.UIList.2.py	2013-09-30 23:48:31 UTC (rev 60461)
@@ -8,7 +8,7 @@
 import bpy
 
 
-class MESH_UL_vgroups_slow(UIList):
+class MESH_UL_vgroups_slow(bpy.types.UIList):
     # Constants (flags)
     # Be careful not to shadow FILTER_ITEM!
     VGROUP_EMPTY = 1 << 0

Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc	2013-09-30 23:02:29 UTC (rev 60460)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv/multiview/fundamental.cc	2013-09-30 23:48:31 UTC (rev 60461)
@@ -20,6 +20,7 @@
 
 #include "libmv/multiview/fundamental.h"
 
+#include "ceres/ceres.h"
 #include "libmv/logging/logging.h"
 #include "libmv/numeric/numeric.h"
 #include "libmv/numeric/poly.h"
@@ -407,4 +408,93 @@
   *E = svd.matrixU() * diag.asDiagonal() * svd.matrixV().transpose();
 }
 
+FundamentalEstimationOptions::FundamentalEstimationOptions(void) :
+    use_refine_if_algebraic_fails(true),
+    max_num_iterations(50),
+    parameter_tolerance(1e-16),
+    function_tolerance(1e-16) {
+}
+
+class FundamentalSymmetricEpipolarCostFunctor {
+ public:
+  FundamentalSymmetricEpipolarCostFunctor(const Vec2 &x,
+                                          const Vec2 &y)
+    : x_(x), y_(y) {}
+
+  template<typename T>
+  bool operator()(const T *fundamental_parameters, T *residuals) const {
+    typedef Eigen::Matrix<T, 3, 3> Mat3;

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list