[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60676] branches/soc-2013-paint: merge with trunk -r60675, should solve some ocio compilation issues.
Antony Riakiotakis
kalast at gmail.com
Fri Oct 11 00:06:02 CEST 2013
Revision: 60676
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60676
Author: psy-fi
Date: 2013-10-10 22:06:01 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
merge with trunk -r60675, should solve some ocio compilation issues.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60675
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/extern/libmv/CMakeLists.txt
branches/soc-2013-paint/extern/libmv/bundle.sh
branches/soc-2013-paint/extern/libmv/libmv-capi.cc
branches/soc-2013-paint/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2013-paint/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_hair_bsdf.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2013-paint/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-paint/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-paint/intern/guardedalloc/SConscript
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-paint/intern/guardedalloc/mmap_win.h
branches/soc-2013-paint/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-paint/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_node.h
branches/soc-2013-paint/source/blender/blenkernel/intern/deform.c
branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_evaluate.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-paint/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-paint/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-paint/source/blender/blenlib/intern/noise.c
branches/soc-2013-paint/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-paint/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-paint/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_cursor.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_ops.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_vertex.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_node/node_templates.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-paint/source/blender/editors/transform/transform_ops.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-paint/source/blender/imbuf/intern/filetype.c
branches/soc-2013-paint/source/blender/imbuf/intern/indexer.c
branches/soc-2013-paint/source/blender/imbuf/intern/oiio/openimageio_api.cpp
branches/soc-2013-paint/source/blender/imbuf/intern/oiio/openimageio_api.h
branches/soc-2013-paint/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-paint/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-paint/source/blender/makesdna/intern/SConscript
branches/soc-2013-paint/source/blender/makesrna/RNA_define.h
branches/soc-2013-paint/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-paint/source/blender/makesrna/intern/SConscript
branches/soc-2013-paint/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-paint/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-paint/source/blender/render/intern/include/render_types.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/imagetexture.c
branches/soc-2013-paint/source/blender/render/intern/source/pixelshading.c
branches/soc-2013-paint/source/blender/render/intern/source/rendercore.c
branches/soc-2013-paint/source/blender/render/intern/source/shadeinput.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-paint/source/creator/creator.c
branches/soc-2013-paint/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
Added Paths:
-----------
branches/soc-2013-paint/extern/libmv/libmv-capi_intern.h
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn_guarded_impl.c
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn_intern.h
branches/soc-2013-paint/intern/guardedalloc/intern/mallocn_lockfree_impl.c
Property Changed:
----------------
branches/soc-2013-paint/
branches/soc-2013-paint/source/blender/editors/interface/interface.c
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,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
+ /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,59942,60073,60094,60096,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-60675
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-10-10 21:04:39 UTC (rev 60675)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-10-10 22:06:01 UTC (rev 60676)
@@ -287,9 +287,6 @@
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
-option(WITH_GUARDEDALLOC "Enable GuardedAlloc (DISABLE AT OWN RISK!)" ON)
-mark_as_advanced(WITH_GUARDEDALLOC)
-
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
Modified: branches/soc-2013-paint/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/extern/libmv/CMakeLists.txt 2013-10-10 21:04:39 UTC (rev 60675)
+++ branches/soc-2013-paint/extern/libmv/CMakeLists.txt 2013-10-10 22:06:01 UTC (rev 60676)
@@ -32,6 +32,7 @@
set(SRC
libmv-capi.h
+ libmv-capi_intern.h
)
if(WITH_LIBMV)
Modified: branches/soc-2013-paint/extern/libmv/bundle.sh
===================================================================
--- branches/soc-2013-paint/extern/libmv/bundle.sh 2013-10-10 21:04:39 UTC (rev 60675)
+++ branches/soc-2013-paint/extern/libmv/bundle.sh 2013-10-10 22:06:01 UTC (rev 60676)
@@ -128,6 +128,7 @@
set(SRC
libmv-capi.h
+ libmv-capi_intern.h
)
if(WITH_LIBMV)
@@ -139,6 +140,7 @@
list(APPEND INC
third_party/ceres/include
+ ../../intern/guardedalloc
)
set(INC_SYS
Modified: branches/soc-2013-paint/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv-capi.cc 2013-10-10 21:04:39 UTC (rev 60675)
+++ branches/soc-2013-paint/extern/libmv/libmv-capi.cc 2013-10-10 22:06:01 UTC (rev 60676)
@@ -43,33 +43,7 @@
# 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-capi_intern.h"
#include "libmv/logging/logging.h"
#include "libmv/multiview/homography.h"
#include "libmv/tracking/track_region.h"
@@ -84,10 +58,6 @@
#include "libmv/simple_pipeline/reconstruction_scale.h"
#include "libmv/simple_pipeline/keyframe_selection.h"
-#ifdef _MSC_VER
-# define snprintf _snprintf
-#endif
-
struct libmv_Reconstruction {
libmv::EuclideanReconstruction reconstruction;
@@ -875,7 +845,7 @@
{
libmv::Feature *features = NULL;
std::vector<libmv::Feature> v;
- struct libmv_Features *libmv_features = LIBMV_OBJECT_NEW(libmv_Features);
+ struct libmv_Features *libmv_features = LIBMV_STRUCT_NEW(libmv_Features, 1);
int i = 0, count;
if (margin) {
@@ -889,7 +859,7 @@
count = v.size();
if (count) {
- features = LIBMV_OBJECT_NEW(libmv::Feature[count]);
+ features = LIBMV_STRUCT_NEW(libmv::Feature, count);
for(std::vector<libmv::Feature>::iterator it = v.begin(); it != v.end(); it++) {
features[i++] = *it;
@@ -908,7 +878,7 @@
int margin, int count, int min_distance)
{
libmv::Feature *features = NULL;
- struct libmv_Features *libmv_features = LIBMV_OBJECT_NEW(libmv_Features);
+ struct libmv_Features *libmv_features = LIBMV_STRUCT_NEW(libmv_Features, 1);
if (count) {
if (margin) {
@@ -917,7 +887,7 @@
height -= 2 * margin;
}
- features = LIBMV_OBJECT_NEW(libmv::Feature[count]);
+ features = LIBMV_STRUCT_NEW(libmv::Feature, count);
libmv::DetectMORAVEC(data, stride, width, height, features, &count, min_distance, NULL);
}
@@ -931,11 +901,10 @@
void libmv_featuresDestroy(struct libmv_Features *libmv_features)
{
if (libmv_features->features) {
- using libmv::Feature;
- LIBMV_OBJECT_DELETE_ARRAY(libmv_features->features, Feature, libmv_features->count);
+ LIBMV_STRUCT_DELETE(libmv_features->features);
}
- LIBMV_OBJECT_DELETE(libmv_features, libmv_Features);
+ LIBMV_STRUCT_DELETE(libmv_features);
}
int libmv_countFeatures(const struct libmv_Features *libmv_features)
Copied: branches/soc-2013-paint/extern/libmv/libmv-capi_intern.h (from rev 60675, trunk/blender/extern/libmv/libmv-capi_intern.h)
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv-capi_intern.h (rev 0)
+++ branches/soc-2013-paint/extern/libmv/libmv-capi_intern.h 2013-10-10 22:06:01 UTC (rev 60676)
@@ -0,0 +1,59 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2013 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef LIBMV_C_API_INTERN_H
+#define LIBMV_C_API_INTERN_H
+
+#if defined(_MSC_VER)
+# define __func__ __FUNCTION__
+# define snprintf _snprintf
+#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_STRUCT_NEW(type, count) (type*)MEM_mallocN(sizeof(type) * count, __func__)
+# define LIBMV_STRUCT_DELETE(what) MEM_freeN(what)
+#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_STRUCT_NEW(type, count) (type*)malloc(sizeof(type) * count)
+# define LIBMV_STRUCT_DELETE(what) { if (what) free(what); } (void)0
+#endif
+
+#endif // LIBMV_C_API_INTERN_H
Modified: branches/soc-2013-paint/extern/libmv/third_party/msinttypes/stdint.h
===================================================================
--- branches/soc-2013-paint/extern/libmv/third_party/msinttypes/stdint.h 2013-10-10 21:04:39 UTC (rev 60675)
+++ branches/soc-2013-paint/extern/libmv/third_party/msinttypes/stdint.h 2013-10-10 22:06:01 UTC (rev 60676)
@@ -72,16 +72,16 @@
// realize that, e.g. char has the same size as __int8
// so we give up on __intX for them.
#if (_MSC_VER < 1300)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list