[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58909] trunk/blender/source/blender/ freestyle/intern: add c++/guardedalloc to more freestyle classes, also remove redundant 'public:'
Campbell Barton
ideasman42 at gmail.com
Sun Aug 4 20:50:00 CEST 2013
Revision: 58909
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58909
Author: campbellbarton
Date: 2013-08-04 18:50:00 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
add c++/guardedalloc to more freestyle classes, also remove redundant 'public:'
Modified Paths:
--------------
trunk/blender/source/blender/freestyle/intern/application/AppView.h
trunk/blender/source/blender/freestyle/intern/application/Controller.h
trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
trunk/blender/source/blender/freestyle/intern/geometry/BBox.h
trunk/blender/source/blender/freestyle/intern/geometry/FastGrid.h
trunk/blender/source/blender/freestyle/intern/geometry/Grid.h
trunk/blender/source/blender/freestyle/intern/geometry/Noise.h
trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h
trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h
trunk/blender/source/blender/freestyle/intern/geometry/VecMat.h
trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h
trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
trunk/blender/source/blender/freestyle/intern/image/Image.h
trunk/blender/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
trunk/blender/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
trunk/blender/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
trunk/blender/source/blender/freestyle/intern/scene_graph/LineRep.h
trunk/blender/source/blender/freestyle/intern/scene_graph/Node.h
trunk/blender/source/blender/freestyle/intern/scene_graph/NodeCamera.h
trunk/blender/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
trunk/blender/source/blender/freestyle/intern/stroke/Module.h
trunk/blender/source/blender/freestyle/intern/stroke/Operators.h
trunk/blender/source/blender/freestyle/intern/stroke/Predicates0D.h
trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeRenderer.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeTesselator.h
trunk/blender/source/blender/freestyle/intern/stroke/StyleModule.h
trunk/blender/source/blender/freestyle/intern/system/BaseIterator.h
trunk/blender/source/blender/freestyle/intern/system/BaseObject.h
trunk/blender/source/blender/freestyle/intern/system/Exception.h
trunk/blender/source/blender/freestyle/intern/system/Id.h
trunk/blender/source/blender/freestyle/intern/system/Interpreter.h
trunk/blender/source/blender/freestyle/intern/system/ProgressBar.h
trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.h
trunk/blender/source/blender/freestyle/intern/system/RandGen.h
trunk/blender/source/blender/freestyle/intern/system/RenderMonitor.h
trunk/blender/source/blender/freestyle/intern/system/TimeStamp.h
trunk/blender/source/blender/freestyle/intern/system/TimeUtils.h
trunk/blender/source/blender/freestyle/intern/view_map/BoxGrid.h
trunk/blender/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
trunk/blender/source/blender/freestyle/intern/view_map/Functions1D.h
trunk/blender/source/blender/freestyle/intern/view_map/GridDensityProvider.h
trunk/blender/source/blender/freestyle/intern/view_map/Interface1D.h
trunk/blender/source/blender/freestyle/intern/view_map/OccluderSource.h
trunk/blender/source/blender/freestyle/intern/view_map/SphericalGrid.h
trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMap.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIterators.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WEdge.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WFillGrid.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdge.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
Modified: trunk/blender/source/blender/freestyle/intern/application/AppView.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/application/AppView.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/application/AppView.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -234,7 +234,6 @@
NodeDrawingStyle *_p2DSelectionNode;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:AppView")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/application/Controller.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/application/Controller.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/application/Controller.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -244,7 +244,6 @@
FEdgeXDetector edgeDetector;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Controller")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -127,7 +127,6 @@
RenderMonitor *_pRenderMonitor;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderFileLoader")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -64,6 +64,11 @@
float get_stroke_vertex_z(void) const;
unsigned int get_stroke_mesh_id(void) const;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderStrokeRenderer")
+#endif
+
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -58,6 +58,11 @@
private:
struct Text *_text;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderStyleModule")
+#endif
+
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -43,6 +43,11 @@
protected:
virtual void loadStandardBrushes();
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderTextureManager")
+#endif
+
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/BBox.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/BBox.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/BBox.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -136,7 +136,6 @@
bool _empty;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BBox")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/FastGrid.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/FastGrid.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/FastGrid.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -76,6 +76,11 @@
protected:
Cell **_cells;
unsigned _cells_size;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FastGrid")
+#endif
+
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Grid.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Grid.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Grid.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -89,7 +89,6 @@
OccludersSet _occluders;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Cell")
#endif
};
@@ -372,7 +371,6 @@
OccludersSet _occluders; // List of all occluders inserted in the grid
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Grid")
#endif
};
@@ -395,7 +393,6 @@
OccludersSet::iterator it, end;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VirtualOccludersSet")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Noise.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Noise.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Noise.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -81,7 +81,6 @@
// int start;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Noise")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -171,7 +171,6 @@
unsigned _id;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Geometry:Polygon")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -190,7 +190,6 @@
bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise.
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Segment")
#endif
};
@@ -337,7 +336,6 @@
std::vector<Intersection<Segment<T, Point> > *> _Intersections; // the list of all intersections.
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SweepLine")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/VecMat.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/VecMat.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/VecMat.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -278,7 +278,6 @@
};
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Vec")
#endif
};
@@ -766,7 +765,6 @@
value_type _coord[_SIZE];
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Matrix")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -129,7 +129,6 @@
int i_[3];
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OGF:NormalCycle")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -115,7 +115,6 @@
void computeMask();
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GaussianFilter")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/image/Image.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/image/Image.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/image/Image.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -173,7 +173,6 @@
unsigned _Oy; // origin of the stored part
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsImage")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/scene_graph/DrawingStyle.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/scene_graph/DrawingStyle.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -106,7 +106,6 @@
bool LightingEnabled;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:DrawingStyle")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/scene_graph/FrsMaterial.h 2013-08-04 18:12:49 UTC (rev 58908)
+++ trunk/blender/source/blender/freestyle/intern/scene_graph/FrsMaterial.h 2013-08-04 18:50:00 UTC (rev 58909)
@@ -259,7 +259,6 @@
float Shininess;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsMaterial")
#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list