[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60637] branches/soc-2013-paint: painstakingly merge with trunk -r60636
Antony Riakiotakis
kalast at gmail.com
Wed Oct 9 19:04:17 CEST 2013
Revision: 60637
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60637
Author: psy-fi
Date: 2013-10-09 17:04:16 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
painstakingly merge with trunk -r60636
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60636
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/SConstruct
branches/soc-2013-paint/build_files/build_environment/install_deps.sh
branches/soc-2013-paint/extern/libmv/CMakeLists.txt
branches/soc-2013-paint/extern/libmv/SConscript
branches/soc-2013-paint/extern/libmv/bundle.sh
branches/soc-2013-paint/extern/libmv/libmv-capi.cc
branches/soc-2013-paint/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
branches/soc-2013-paint/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-paint/intern/cycles/device/device_cuda.cpp
branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp
branches/soc-2013-paint/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/kernel/SConscript
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/kernel/kernel_shader.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-paint/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-paint/intern/cycles/kernel/kernel_subsurface.h
branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-paint/intern/cycles/util/util_opengl.h
branches/soc-2013-paint/intern/cycles/util/util_types.h
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
branches/soc-2013-paint/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-paint/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-paint/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-paint/intern/opencolorio/CMakeLists.txt
branches/soc-2013-paint/intern/opencolorio/SConscript
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/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-paint/release/datafiles/splash.png
branches/soc-2013-paint/release/scripts/modules/bpy/path.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/node.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-paint/source/blender/CMakeLists.txt
branches/soc-2013-paint/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2013-paint/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2013-paint/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-paint/source/blender/blenkernel/intern/curve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-paint/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/image.c
branches/soc-2013-paint/source/blender/blenkernel/intern/library.c
branches/soc-2013-paint/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-paint/source/blender/blenkernel/intern/node.c
branches/soc-2013-paint/source/blender/blenkernel/intern/particle.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/scene.c
branches/soc-2013-paint/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-paint/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-paint/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-paint/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-paint/source/blender/blenlib/intern/lasso.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/blenloader/intern/writefile.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators.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/intern/bmesh_walkers_impl.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_attribute.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-paint/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-paint/source/blender/collada/ArmatureExporter.cpp
branches/soc-2013-paint/source/blender/collada/ControllerExporter.cpp
branches/soc-2013-paint/source/blender/collada/ExportSettings.h
branches/soc-2013-paint/source/blender/collada/collada.cpp
branches/soc-2013-paint/source/blender/collada/collada.h
branches/soc-2013-paint/source/blender/editors/animation/anim_markers.c
branches/soc-2013-paint/source/blender/editors/animation/keyframing.c
branches/soc-2013-paint/source/blender/editors/armature/pose_lib.c
branches/soc-2013-paint/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-paint/source/blender/editors/include/ED_render.h
branches/soc-2013-paint/source/blender/editors/include/ED_view3d.h
branches/soc-2013-paint/source/blender/editors/interface/CMakeLists.txt
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/interface/interface_draw.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/interface_intern.h
branches/soc-2013-paint/source/blender/editors/interface/interface_layout.c
branches/soc-2013-paint/source/blender/editors/interface/interface_ops.c
branches/soc-2013-paint/source/blender/editors/interface/interface_regions.c
branches/soc-2013-paint/source/blender/editors/io/io_collada.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_bake.c
branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
branches/soc-2013-paint/source/blender/editors/render/render_internal.c
branches/soc-2013-paint/source/blender/editors/screen/glutil.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-paint/source/blender/editors/space_console/space_console.c
branches/soc-2013-paint/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2013-paint/source/blender/editors/space_file/file_intern.h
branches/soc-2013-paint/source/blender/editors/space_file/file_ops.c
branches/soc-2013-paint/source/blender/editors/space_file/file_panels.c
branches/soc-2013-paint/source/blender/editors/space_file/space_file.c
branches/soc-2013-paint/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-paint/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2013-paint/source/blender/editors/space_image/image_draw.c
branches/soc-2013-paint/source/blender/editors/space_image/image_ops.c
branches/soc-2013-paint/source/blender/editors/space_node/drawnode.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_view3d/space_view3d.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-paint/source/blender/editors/transform/transform.c
branches/soc-2013-paint/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-paint/source/blender/imbuf/CMakeLists.txt
branches/soc-2013-paint/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-paint/source/blender/imbuf/IMB_imbuf.h
branches/soc-2013-paint/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-paint/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2013-paint/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-paint/source/blender/imbuf/intern/filetype.c
branches/soc-2013-paint/source/blender/imbuf/intern/readimage.c
branches/soc-2013-paint/source/blender/imbuf/intern/util.c
branches/soc-2013-paint/source/blender/imbuf/intern/writeimage.c
branches/soc-2013-paint/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2013-paint/source/blender/python/intern/CMakeLists.txt
branches/soc-2013-paint/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2013-paint/source/blender/render/extern/include/RE_multires_bake.h
branches/soc-2013-paint/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-paint/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2013-paint/source/blender/render/intern/source/bake.c
branches/soc-2013-paint/source/blender/render/intern/source/convertblender.c
branches/soc-2013-paint/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
branches/soc-2013-paint/source/blender/windowmanager/WM_api.h
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-paint/source/blender/windowmanager/wm_subwindow.h
branches/soc-2013-paint/source/blenderplayer/CMakeLists.txt
branches/soc-2013-paint/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-paint/source/creator/CMakeLists.txt
branches/soc-2013-paint/source/creator/creator.c
branches/soc-2013-paint/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-paint/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-paint/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/soc-2013-paint/intern/opencolorio/gpu_shader_display_transform.glsl
branches/soc-2013-paint/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
branches/soc-2013-paint/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py
branches/soc-2013-paint/source/blender/editors/interface/interface_eyedropper.c
branches/soc-2013-paint/source/blender/imbuf/intern/oiio/
Removed Paths:
-------------
branches/soc-2013-paint/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
branches/soc-2013-paint/release/scripts/presets/operator/wm.collada_export/second_life_static.py
Property Changed:
----------------
branches/soc-2013-paint/
branches/soc-2013-paint/source/blender/editors/interface/interface.c
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,60105
/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-60501
+ /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,60105
/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
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57386-60636
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-10-09 17:04:16 UTC (rev 60637)
@@ -206,6 +206,7 @@
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
option(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
+option(WITH_IMAGE_PSD "Enable Photoshop PSD Support" ON)
option(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
@@ -278,6 +279,10 @@
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
+# currently only used for BLI_mempool
+option(WITH_MEM_VALGRIND "Enable extended valgrind support for better reporting" OFF)
+mark_as_advanced(WITH_MEM_VALGRIND)
+
# Debug
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
@@ -368,7 +373,7 @@
endif()
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
endif()
if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -437,6 +442,11 @@
set(WITH_CYCLES OFF)
endif()
+# auto enable openimageio for photoshop psd
+if(WITH_IMAGE_PSD)
+ set(WITH_OPENIMAGEIO ON)
+endif()
+
# enable boost for cycles, booleans, audaspace or i18n
# otherwise if the user disabled
if(NOT WITH_BOOST)
@@ -2281,6 +2291,7 @@
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
info_cfg_option(WITH_MEM_JEMALLOC)
+ info_cfg_option(WITH_MEM_VALGRIND)
info_cfg_option(WITH_SYSTEM_GLEW)
info_cfg_option(WITH_SYSTEM_OPENJPEG)
@@ -2292,6 +2303,7 @@
info_cfg_option(WITH_IMAGE_OPENJPEG)
info_cfg_option(WITH_IMAGE_REDCODE)
info_cfg_option(WITH_IMAGE_TIFF)
+ info_cfg_option(WITH_IMAGE_PSD)
info_cfg_text("Audio:")
info_cfg_option(WITH_OPENAL)
Modified: branches/soc-2013-paint/SConstruct
===================================================================
--- branches/soc-2013-paint/SConstruct 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/SConstruct 2013-10-09 17:04:16 UTC (rev 60637)
@@ -246,6 +246,7 @@
target_env_defs['WITH_BF_CYCLES'] = False
target_env_defs['WITH_BF_OPENAL'] = False
target_env_defs['WITH_BF_OPENEXR'] = False
+ target_env_defs['WITH_BF_PSD'] = False
target_env_defs['WITH_BF_OPENMP'] = False
target_env_defs['WITH_BF_ICONV'] = False
target_env_defs['WITH_BF_INTERNATIONAL'] = False
@@ -551,6 +552,7 @@
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+ data_to_c_simple("intern/opencolorio/gpu_shader_display_transform.glsl")
# --- blender ---
data_to_c_simple("release/datafiles/bfont.pfb")
Modified: branches/soc-2013-paint/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-paint/build_files/build_environment/install_deps.sh 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/build_files/build_environment/install_deps.sh 2013-10-09 17:04:16 UTC (rev 60637)
@@ -3145,7 +3145,7 @@
fi
if $ALL_STATIC; then
- INFO "LLIB = ["xml2", "expat"] + LLIB"
+ INFO "LLIBS = [\""xml2"\", \""expat"\"] + LLIBS"
fi
INFO ""
Modified: branches/soc-2013-paint/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/extern/libmv/CMakeLists.txt 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/extern/libmv/CMakeLists.txt 2013-10-09 17:04:16 UTC (rev 60637)
@@ -37,10 +37,13 @@
if(WITH_LIBMV)
add_definitions(
-DWITH_LIBMV
+ -DWITH_LIBMV_GUARDED_ALLOC
+ -DGOOGLE_GLOG_DLL_DECL=
)
list(APPEND INC
third_party/ceres/include
+ ../../intern/guardedalloc
)
set(INC_SYS
@@ -224,10 +227,6 @@
third_party/glog/src
)
endif()
-
- add_definitions(
- -DGOOGLE_GLOG_DLL_DECL=
- )
else()
list(APPEND SRC
libmv-capi_stub.cc
Modified: branches/soc-2013-paint/extern/libmv/SConscript
===================================================================
--- branches/soc-2013-paint/extern/libmv/SConscript 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/extern/libmv/SConscript 2013-10-09 17:04:16 UTC (rev 60637)
@@ -15,6 +15,7 @@
if env['WITH_BF_LIBMV']:
defs.append('GOOGLE_GLOG_DLL_DECL=')
defs.append('WITH_LIBMV')
+ defs.append('WITH_LIBMV_GUARDED_ALLOC')
src = env.Glob("libmv-capi.cc")
src += env.Glob('libmv/image/*.cc')
@@ -25,7 +26,7 @@
src += env.Glob('third_party/fast/*.c')
src += env.Glob('third_party/gflags/*.cc')
- incs += ' ../Eigen3 third_party/ceres/include'
+ incs += ' ../Eigen3 third_party/ceres/include ../../intern/guardedalloc'
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
Modified: branches/soc-2013-paint/extern/libmv/bundle.sh
===================================================================
--- branches/soc-2013-paint/extern/libmv/bundle.sh 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/extern/libmv/bundle.sh 2013-10-09 17:04:16 UTC (rev 60637)
@@ -133,6 +133,8 @@
if(WITH_LIBMV)
add_definitions(
-DWITH_LIBMV
+ -DWITH_LIBMV_GUARDED_ALLOC
+ -DGOOGLE_GLOG_DLL_DECL=
)
list(APPEND INC
@@ -203,10 +205,6 @@
third_party/glog/src
)
endif()
-
- add_definitions(
- -DGOOGLE_GLOG_DLL_DECL=
- )
else()
list(APPEND SRC
libmv-capi_stub.cc
@@ -238,11 +236,12 @@
if env['WITH_BF_LIBMV']:
defs.append('GOOGLE_GLOG_DLL_DECL=')
defs.append('WITH_LIBMV')
+ defs.append('WITH_LIBMV_GUARDED_ALLOC')
src = env.Glob("libmv-capi.cc")
$src
- incs += ' ../Eigen3 third_party/ceres/include'
+ incs += ' ../Eigen3 third_party/ceres/include ../../intern/guardedalloc'
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
Modified: branches/soc-2013-paint/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv-capi.cc 2013-10-09 16:53:35 UTC (rev 60636)
+++ branches/soc-2013-paint/extern/libmv/libmv-capi.cc 2013-10-09 17:04:16 UTC (rev 60637)
@@ -43,10 +43,36 @@
# include <png.h>
#endif
+#ifdef WITH_LIBMV_GUARDED_ALLOC
+# include "MEM_guardedalloc.h"
+# define LIBMV_OBJECT_NEW OBJECT_GUARDED_NEW
+# define LIBMV_OBJECT_DELETE OBJECT_GUARDED_DELETE
+# define LIBMV_OBJECT_DELETE OBJECT_GUARDED_DELETE
+# define LIBMV_OBJECT_DELETE_ARRAY OBJECT_GUARDED_DELETE_ARRAY
+#else
+// Need this to keep libmv-capi potentially standalone.
+# if defined __GNUC__ || defined __sun
+# define LIBMV_OBJECT_NEW(type, args ...) \
+ new(malloc(sizeof(type))) type(args)
+# else
+# define LIBMV_OBJECT_NEW(type, ...) \
+ new(malloc(sizeof(type))) type(__VA_ARGS__)
+#endif
+# define LIBMV_OBJECT_DELETE(what, type) \
+ { if(what) { \
+ ((type*)(what))->~type(); \
+ free(what); \
+ } } (void)0
+#define LIBMV_OBJECT_DELETE_ARRAY(what, type, count) \
+ { if(what) { \
+ for (int i = 0; i < count; i++) ((type*)(what))[i].~type(); \
+ free(what); \
+ } } (void)0
+#endif
+
#include "libmv/logging/logging.h"
-
+#include "libmv/multiview/homography.h"
#include "libmv/tracking/track_region.h"
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list