[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59966] branches/soc-2013-paint: merge with trunk -r59965
Antony Riakiotakis
kalast at gmail.com
Mon Sep 9 21:06:44 CEST 2013
Revision: 59966
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59966
Author: psy-fi
Date: 2013-09-09 19:06:44 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
merge with trunk -r59965
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59965
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2013-paint/build_files/cmake/macros.cmake
branches/soc-2013-paint/build_files/scons/config/darwin-config.py
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-paint/extern/libmv/libmv-capi.cc
branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-paint/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_film.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_path.h
branches/soc-2013-paint/intern/cycles/render/nodes.cpp
branches/soc-2013-paint/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-paint/intern/ghost/test/CMakeLists.txt
branches/soc-2013-paint/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2013-paint/intern/mikktspace/mikktspace.c
branches/soc-2013-paint/intern/opencolorio/fallback_impl.cc
branches/soc-2013-paint/intern/opencolorio/ocio_capi.cc
branches/soc-2013-paint/intern/opencolorio/ocio_capi.h
branches/soc-2013-paint/intern/opencolorio/ocio_impl.cc
branches/soc-2013-paint/intern/opencolorio/ocio_impl.h
branches/soc-2013-paint/release/datafiles/colormanagement/config.ocio
branches/soc-2013-paint/release/datafiles/startup.blend
branches/soc-2013-paint/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_constraint.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_colortools.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_object.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2013-paint/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/anim.c
branches/soc-2013-paint/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-paint/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-paint/source/blender/blenkernel/intern/curve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-paint/source/blender/blenkernel/intern/freestyle.c
branches/soc-2013-paint/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mask.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-paint/source/blender/blenkernel/intern/multires.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenkernel/intern/scene.c
branches/soc-2013-paint/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-paint/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-paint/source/blender/blenkernel/intern/text.c
branches/soc-2013-paint/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-paint/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-paint/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-paint/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
branches/soc-2013-paint/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-paint/source/blender/bmesh/bmesh.h
branches/soc-2013-paint/source/blender/bmesh/bmesh_class.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-paint/source/blender/collada/MeshImporter.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2013-paint/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-paint/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-paint/source/blender/editors/armature/armature_utils.c
branches/soc-2013-paint/source/blender/editors/armature/pose_slide.c
branches/soc-2013-paint/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/interface_ops.c
branches/soc-2013-paint/source/blender/editors/interface/interface_templates.c
branches/soc-2013-paint/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-paint/source/blender/editors/object/object_edit.c
branches/soc-2013-paint/source/blender/editors/object/object_transform.c
branches/soc-2013-paint/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2013-paint/source/blender/editors/physics/physics_pointcache.c
branches/soc-2013-paint/source/blender/editors/render/render_internal.c
branches/soc-2013-paint/source/blender/editors/render/render_opengl.c
branches/soc-2013-paint/source/blender/editors/screen/glutil.c
branches/soc-2013-paint/source/blender/editors/screen/screen_ops.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_intern.h
branches/soc-2013-paint/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-paint/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-paint/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-paint/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-paint/source/blender/editors/space_image/image_ops.c
branches/soc-2013-paint/source/blender/editors/space_node/node_draw.c
branches/soc-2013-paint/source/blender/editors/space_node/node_edit.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-paint/source/blender/editors/space_text/text_ops.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-paint/source/blender/editors/transform/transform_snap.c
branches/soc-2013-paint/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/Functions0D.h
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-paint/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-paint/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-paint/source/blender/imbuf/intern/bmp.c
branches/soc-2013-paint/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-paint/source/blender/imbuf/intern/divers.c
branches/soc-2013-paint/source/blender/makesdna/DNA_color_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2013-paint/source/blender/makesrna/RNA_enum_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_build.c
branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
branches/soc-2013-paint/source/blender/render/intern/source/rayshade.c
branches/soc-2013-paint/source/blender/render/intern/source/render_result.c
branches/soc-2013-paint/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-paint/source/blender/windowmanager/WM_api.h
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-paint/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-paint/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-paint/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2013-paint/intern/cycles/kernel/kernel_path_state.h
branches/soc-2013-paint/intern/ghost/test/multitest/stubs.c
branches/soc-2013-paint/release/datafiles/colormanagement/luts/camera_response/
branches/soc-2013-paint/release/datafiles/colormanagement/luts/film_response/
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_evaluate.c
branches/soc-2013-paint/source/blender/blenlib/BLI_sort_utils.h
branches/soc-2013-paint/source/blender/blenlib/intern/sort_utils.c
Property Changed:
----------------
branches/soc-2013-paint/
branches/soc-2013-paint/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-paint
___________________________________________________________________
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:57386-59842
+ /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:57386-59965
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-09-09 19:06:44 UTC (rev 59966)
@@ -306,7 +306,9 @@
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
- if(${MAC_SYS} MATCHES 12)
+ if(${MAC_SYS} MATCHES 13)
+ set(OSX_SYSTEM 10.9)
+ elseif(${MAC_SYS} MATCHES 12)
set(OSX_SYSTEM 10.8)
elseif(${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
@@ -1781,6 +1783,9 @@
set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
endif()
+
+ # Xcode 5 has too low template depth of 128 for libmv
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
endif()
#-----------------------------------------------------------------------------
Modified: branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py 2013-09-09 19:06:44 UTC (rev 59966)
@@ -34,6 +34,8 @@
MAC_CUR_VER='10.7'
elif cmd_res[:2]=='12':
MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+ MAC_CUR_VER='10.9'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -367,7 +369,7 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py 2013-09-09 19:06:44 UTC (rev 59966)
@@ -34,6 +34,8 @@
MAC_CUR_VER='10.7'
elif cmd_res[:2]=='12':
MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+ MAC_CUR_VER='10.9'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -367,7 +369,7 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2013-paint/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-09-09 19:06:44 UTC (rev 59966)
@@ -498,6 +498,7 @@
remove_cc_flag("-Wredundant-decls")
remove_cc_flag("-Wundef")
remove_cc_flag("-Wshadow")
+ remove_cc_flag("-Wdouble-promotion")
remove_cc_flag("-Wold-style-definition")
remove_cc_flag("-Werror=[^ ]+")
remove_cc_flag("-Werror")
Modified: branches/soc-2013-paint/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/darwin-config.py 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/build_files/scons/config/darwin-config.py 2013-09-09 19:06:44 UTC (rev 59966)
@@ -34,6 +34,8 @@
MAC_CUR_VER='10.7'
elif cmd_res[:2]=='12':
MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+ MAC_CUR_VER='10.9'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -346,8 +348,9 @@
CFLAGS = []
CXXFLAGS = []
-CCFLAGS = ['-pipe','-funsigned-char']
+CCFLAGS = ['-pipe','-funsigned-char','-ftemplate-depth=1024']
+
CPPFLAGS = list(ARCH_FLAGS)
if WITH_GHOST_COCOA:
@@ -367,7 +370,7 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc 2013-09-09 19:06:44 UTC (rev 59966)
@@ -288,7 +288,7 @@
}
} // namespace
-void SelectkeyframesBasedOnGRICAndVariance(const Tracks &tracks,
+void SelectKeyframesBasedOnGRICAndVariance(const Tracks &tracks,
CameraIntrinsics &intrinsics,
vector<int> &keyframes) {
// Mirza Tahir Ahmed, Matthew N. Dailey
Modified: branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.h 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/keyframe_selection.h 2013-09-09 19:06:44 UTC (rev 59966)
@@ -43,7 +43,7 @@
// \param intrinsics is camera intrinsics
// \param keyframes will contain all images number which are considered
// good to be used for reconstruction
-void SelectkeyframesBasedOnGRICAndVariance(const Tracks &tracks,
+void SelectKeyframesBasedOnGRICAndVariance(const Tracks &tracks,
CameraIntrinsics &intrinsics,
vector<int> &keyframes);
Modified: branches/soc-2013-paint/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv-capi.cc 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/extern/libmv/libmv-capi.cc 2013-09-09 19:06:44 UTC (rev 59966)
@@ -510,7 +510,7 @@
libmv::vector<int> keyframes;
/* Get list of all keyframe candidates first. */
- SelectkeyframesBasedOnGRICAndVariance(normalized_tracks,
+ SelectKeyframesBasedOnGRICAndVariance(normalized_tracks,
camera_intrinsics,
keyframes);
Modified: branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/addon/ui.py 2013-09-09 18:39:51 UTC (rev 59965)
+++ branches/soc-2013-paint/intern/cycles/blender/addon/ui.py 2013-09-09 19:06:44 UTC (rev 59966)
@@ -811,7 +811,6 @@
def draw(self, context):
layout = self.layout
- layout.active = False
world = context.world
panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Volume')
@@ -957,7 +956,6 @@
def draw(self, context):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list