[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60642] branches/vgroup_modifiers: svn merge -r 60588:60640 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Wed Oct 9 20:22:56 CEST 2013
Revision: 60642
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60642
Author: mont29
Date: 2013-10-09 18:22:55 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
svn merge -r 60588:60640 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/SConstruct
branches/vgroup_modifiers/extern/libmv/CMakeLists.txt
branches/vgroup_modifiers/extern/libmv/SConscript
branches/vgroup_modifiers/extern/libmv/bundle.sh
branches/vgroup_modifiers/extern/libmv/libmv-capi.cc
branches/vgroup_modifiers/intern/cycles/blender/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp
branches/vgroup_modifiers/intern/cycles/device/device_cuda.cpp
branches/vgroup_modifiers/intern/cycles/kernel/CMakeLists.txt
branches/vgroup_modifiers/intern/cycles/kernel/SConscript
branches/vgroup_modifiers/intern/cycles/kernel/kernel_path.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_shader.h
branches/vgroup_modifiers/intern/cycles/kernel/kernel_subsurface.h
branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_shader.cpp
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_closure.h
branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_types.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/vgroup_modifiers/intern/guardedalloc/MEM_guardedalloc.h
branches/vgroup_modifiers/intern/opencolorio/CMakeLists.txt
branches/vgroup_modifiers/intern/opencolorio/SConscript
branches/vgroup_modifiers/intern/opencolorio/fallback_impl.cc
branches/vgroup_modifiers/intern/opencolorio/ocio_capi.cc
branches/vgroup_modifiers/intern/opencolorio/ocio_capi.h
branches/vgroup_modifiers/intern/opencolorio/ocio_impl.cc
branches/vgroup_modifiers/intern/opencolorio/ocio_impl.h
branches/vgroup_modifiers/intern/opencolorio/ocio_impl_glsl.cc
branches/vgroup_modifiers/release/datafiles/splash.png
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_paint_common.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_image.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/vgroup_modifiers/source/blender/CMakeLists.txt
branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/curve.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_evaluate.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_linklist_stack.h
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/blenloader/intern/versioning_legacy.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.h
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_bridge.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_dupe.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_edgenet.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_attribute.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_holes.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_inset.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_symmetrize.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_triangulate.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_utils.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_triangulate.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_lib.c
branches/vgroup_modifiers/source/blender/editors/interface/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_draw.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_ops.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
branches/vgroup_modifiers/source/blender/editors/object/object_bake.c
branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
branches/vgroup_modifiers/source/blender/editors/screen/glutil.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_cursor.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_intern.h
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
branches/vgroup_modifiers/source/blender/editors/space_file/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/space_file/file_intern.h
branches/vgroup_modifiers/source/blender/editors/space_file/file_ops.c
branches/vgroup_modifiers/source/blender/editors/space_file/file_panels.c
branches/vgroup_modifiers/source/blender/editors/space_file/space_file.c
branches/vgroup_modifiers/source/blender/editors/space_image/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c
branches/vgroup_modifiers/source/blender/imbuf/CMakeLists.txt
branches/vgroup_modifiers/source/blender/imbuf/IMB_colormanagement.h
branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf.h
branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf_types.h
branches/vgroup_modifiers/source/blender/imbuf/intern/IMB_filetype.h
branches/vgroup_modifiers/source/blender/imbuf/intern/colormanagement.c
branches/vgroup_modifiers/source/blender/imbuf/intern/filetype.c
branches/vgroup_modifiers/source/blender/imbuf/intern/readimage.c
branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
branches/vgroup_modifiers/source/blender/imbuf/intern/writeimage.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h
branches/vgroup_modifiers/source/blender/makesrna/intern/CMakeLists.txt
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_meta.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_render.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/python/intern/CMakeLists.txt
branches/vgroup_modifiers/source/blender/render/extern/include/RE_multires_bake.h
branches/vgroup_modifiers/source/blender/render/extern/include/RE_pipeline.h
branches/vgroup_modifiers/source/blender/render/extern/include/RE_shader_ext.h
branches/vgroup_modifiers/source/blender/render/intern/source/bake.c
branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
branches/vgroup_modifiers/source/blender/render/intern/source/multires_bake.c
branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_dragdrop.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/blenderplayer/CMakeLists.txt
branches/vgroup_modifiers/source/creator/CMakeLists.txt
branches/vgroup_modifiers/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/vgroup_modifiers/intern/opencolorio/gpu_shader_display_transform.glsl
branches/vgroup_modifiers/source/blender/editors/interface/interface_eyedropper.c
branches/vgroup_modifiers/source/blender/imbuf/intern/oiio/
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
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
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60588
+ /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:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60640
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2013-10-09 18:08:05 UTC (rev 60641)
+++ branches/vgroup_modifiers/CMakeLists.txt 2013-10-09 18:22:55 UTC (rev 60642)
@@ -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)
@@ -372,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")
@@ -441,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)
@@ -2297,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/vgroup_modifiers/SConstruct
===================================================================
--- branches/vgroup_modifiers/SConstruct 2013-10-09 18:08:05 UTC (rev 60641)
+++ branches/vgroup_modifiers/SConstruct 2013-10-09 18:22:55 UTC (rev 60642)
@@ -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/vgroup_modifiers/extern/libmv/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/extern/libmv/CMakeLists.txt 2013-10-09 18:08:05 UTC (rev 60641)
+++ branches/vgroup_modifiers/extern/libmv/CMakeLists.txt 2013-10-09 18:22:55 UTC (rev 60642)
@@ -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/vgroup_modifiers/extern/libmv/SConscript
===================================================================
--- branches/vgroup_modifiers/extern/libmv/SConscript 2013-10-09 18:08:05 UTC (rev 60641)
+++ branches/vgroup_modifiers/extern/libmv/SConscript 2013-10-09 18:22:55 UTC (rev 60642)
@@ -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/vgroup_modifiers/extern/libmv/bundle.sh
===================================================================
--- branches/vgroup_modifiers/extern/libmv/bundle.sh 2013-10-09 18:08:05 UTC (rev 60641)
+++ branches/vgroup_modifiers/extern/libmv/bundle.sh 2013-10-09 18:22:55 UTC (rev 60642)
@@ -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/vgroup_modifiers/extern/libmv/libmv-capi.cc
===================================================================
--- branches/vgroup_modifiers/extern/libmv/libmv-capi.cc 2013-10-09 18:08:05 UTC (rev 60641)
+++ branches/vgroup_modifiers/extern/libmv/libmv-capi.cc 2013-10-09 18:22:55 UTC (rev 60642)
@@ -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"
-
#include "libmv/simple_pipeline/callbacks.h"
#include "libmv/simple_pipeline/tracks.h"
#include "libmv/simple_pipeline/initialize_reconstruction.h"
@@ -58,8 +84,6 @@
#include "libmv/simple_pipeline/reconstruction_scale.h"
#include "libmv/simple_pipeline/keyframe_selection.h"
-#include "libmv/multiview/homography.h"
-
#ifdef _MSC_VER
# define snprintf _snprintf
#endif
@@ -388,14 +412,15 @@
struct libmv_Tracks *libmv_tracksNew(void)
{
- libmv::Tracks *libmv_tracks = new libmv::Tracks();
+ libmv::Tracks *libmv_tracks = LIBMV_OBJECT_NEW(libmv::Tracks);
return (struct libmv_Tracks *)libmv_tracks;
}
void libmv_tracksDestroy(struct libmv_Tracks *libmv_tracks)
{
- delete (libmv::Tracks*) libmv_tracks;
+ using libmv::Tracks;
+ LIBMV_OBJECT_DELETE(libmv_tracks, Tracks);
}
void libmv_tracksInsert(struct libmv_Tracks *libmv_tracks, int image, int track, double x, double y)
@@ -578,7 +603,7 @@
reconstruct_progress_update_cb progress_update_callback,
void *callback_customdata)
{
- struct libmv_Reconstruction *libmv_reconstruction = new libmv_Reconstruction();
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list