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

Gavin Howard gavin.d.howard at gmail.com
Mon Aug 5 01:48:50 CEST 2013


Revision: 58914
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58914
Author:   gdh
Date:     2013-08-04 23:48:50 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58896 to r58913.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-cycles_mblur/intern/dualcon/dualcon.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/GeoCommon.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/MemoryAllocator.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/ModelReader.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.cpp
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/Queue.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/cubes.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/dualcon_c_api.cpp
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/manifold_table.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/marching_cubes_table.h
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sketch.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/runtime.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/resources.c
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/application/AppView.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/application/Controller.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/BBox.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/FastGrid.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/Grid.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/Noise.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/Polygon.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/SweepLine.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/VecMat.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/normal_cycle.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/image/GaussianFilter.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/image/Image.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/LineRep.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/Node.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/NodeCamera.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/Module.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/Operators.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/Predicates0D.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/Stroke.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeRenderer.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeRep.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeTesselator.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StyleModule.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/BaseIterator.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/BaseObject.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/Exception.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/Id.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/Interpreter.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/ProgressBar.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/PseudoNoise.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/RandGen.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/RenderMonitor.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/TimeStamp.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/system/TimeUtils.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/BoxGrid.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/Functions1D.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/GridDensityProvider.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/Interface1D.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/OccluderSource.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/SphericalGrid.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/SteerableViewMap.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMap.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapIterators.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/winged_edge/WEdge.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/winged_edge/WFillGrid.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/winged_edge/WXEdge.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
    branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/


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
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58895
   + /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
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58913

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -834,7 +834,7 @@
 typedef struct KernelBlackbody {
 	int table_offset;
 	int pad1, pad2, pad3;
-} KernelBLACKBODY;
+} KernelBlackbody;
 
 
 typedef struct KernelData {

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/dualcon.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/dualcon.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/dualcon.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -23,6 +23,10 @@
 #ifndef __DUALCON_H__
 #define __DUALCON_H__
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#  include "MEM_guardedalloc.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/GeoCommon.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/GeoCommon.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/GeoCommon.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef GEOCOMMON_H
-#define GEOCOMMON_H
+#ifndef __GEOCOMMON_H__
+#define __GEOCOMMON_H__
 
 #define UCHAR unsigned char
 #define USHORT unsigned short
@@ -61,4 +61,4 @@
 } BoundingBoxf;
 
 
-#endif
+#endif  /* __GEOCOMMON_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/MemoryAllocator.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/MemoryAllocator.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/MemoryAllocator.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef MEMORYALLOCATOR_H
-#define MEMORYALLOCATOR_H
+#ifndef __MEMORYALLOCATOR_H__
+#define __MEMORYALLOCATOR_H__
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -53,6 +53,11 @@
 virtual int getAllocated( ) = 0;
 virtual int getAll( ) = 0;
 virtual int getBytes( ) = 0;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:VirtualMemoryAllocator")
+#endif
+
 };
 
 /**
@@ -216,6 +221,11 @@
 {
 	return N;
 };
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:MemoryAllocator")
+#endif
+
 };
 
-#endif
+#endif  /* __MEMORYALLOCATOR_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/ModelReader.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/ModelReader.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/ModelReader.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef MODELREADER_H
-#define MODELREADER_H
+#ifndef __MODELREADER_H__
+#define __MODELREADER_H__
 
 #include "GeoCommon.h"
 
@@ -59,7 +59,11 @@
 virtual void getNextVertex(float v[3]) = 0;
 
 virtual void printInfo( ) = 0;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:ModelReader")
+#endif
+
 };
 
-
-#endif
+#endif  /* __MODELREADER_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.cpp	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.cpp	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,6 +20,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#  include "MEM_guardedalloc.h"
+#endif
+
 #include <math.h>
 #include "Projections.h"
 

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/Projections.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef PROJECTIONS_H
-#define PROJECTIONS_H
+#ifndef __PROJECTIONS_H__
+#define __PROJECTIONS_H__
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -125,6 +125,11 @@
 	int isIntersectingPrimary(int edgeInd) const;
 
 	float getIntersectionPrimary(int edgeInd) const;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:CubeTriangleIsect")
+#endif
+
 };
 
-#endif
+#endif  /* __PROJECTIONS_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/Queue.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/Queue.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/Queue.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef __QUEUE_H__
+#define __QUEUE_H__
 
 struct gridQueueEle {
 	int x, y, z;
@@ -99,10 +99,10 @@
 	return 1;
 }
 
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:GridQueue")
+#endif
+
 };
 
-
-
-
-
-#endif
+#endif  /* __QUEUE_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/cubes.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/cubes.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/cubes.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef CUBES_H
-#define CUBES_H
+#ifndef __CUBES_H__
+#define __CUBES_H__
 
 #include "marching_cubes_table.h"
 
@@ -41,6 +41,11 @@
 	for (int i = 0; i < 3; i++)
 		indices[i] = marching_cubes_tris[mask][index][i];
 }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:Cubes")
+#endif
+
 };
 
-#endif
+#endif  /* __CUBES_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/dualcon_c_api.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/dualcon_c_api.cpp	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/dualcon_c_api.cpp	2013-08-04 23:48:50 UTC (rev 58914)
@@ -185,6 +185,11 @@
 int getMemory() {
 	return sizeof(DualConInputReader);
 }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:DualConInputReader")
+#endif
+
 };
 
 void *dualcon(const DualConInput *input_mesh,

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/manifold_table.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/manifold_table.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/manifold_table.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef MANIFOLD_TABLE_H
-#define MANIFOLD_TABLE_H
+#ifndef __MANIFOLD_TABLE_H__
+#define __MANIFOLD_TABLE_H__
 
 typedef struct {
 	int comps;
@@ -30,4 +30,4 @@
 
 extern const ManifoldIndices manifold_table[256];
 
-#endif
+#endif  /* __MANIFOLD_TABLE_H__ */

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/marching_cubes_table.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/marching_cubes_table.h	2013-08-04 23:17:27 UTC (rev 58913)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/marching_cubes_table.h	2013-08-04 23:48:50 UTC (rev 58914)
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef MARCHING_CUBES_TABLE_H
-#define MARCHING_CUBES_TABLE_H
+#ifndef __MARCHING_CUBES_TABLE_H__
+#define __MARCHING_CUBES_TABLE_H__
 
 /* number of configurations */
 #define TOTCONF 256

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp	2013-08-04 23:17:27 UTC (rev 58913)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list