[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55915] trunk/blender/source/blender: Attempt to fix a potential name conflict between Freestyle and the compositor .
Ton Roosendaal
ton at blender.org
Tue Apr 9 15:45:04 CEST 2013
Hi Tamito,
Freestyle works for me now, thanks!
-Ton-
------------------------------------------------------------------------
Ton Roosendaal Blender Foundation ton at blender.org www.blender.org
Blender Institute Entrepotdok 57A 1018AD Amsterdam The Netherlands
On 9 Apr, 2013, at 2:46, Tamito Kajiyama wrote:
> Revision: 55915
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55915
> Author: kjym3
> Date: 2013-04-09 00:46:49 +0000 (Tue, 09 Apr 2013)
> Log Message:
> -----------
> Attempt to fix a potential name conflict between Freestyle and the compositor.
>
> A crash in the Freestyle renderer was reported by Ton on IRC with a stack trace
> below. Note that #2 is in Freestyle, whereas #1 is in the compositor. The problem
> was observed in a debug build on OS X 10.7 (gcc 4.2, openmp disabled, no llvm).
>
> ----------------------------------------------------------------------
> Program received signal EXC_BAD_ACCESS, Could not access memory.
> Reason: 13 at address: 0x0000000000000000
> [Switching to process 72386 thread 0xf303]
> 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43
> 43 delete (this->m_outputsockets.back());
> Current language: auto; currently c++
> (gdb) where
> #0 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43
> #1 0x0000000100c29066 in Node::~Node (this=0x10e501c80) at COM_Node.h:49
> #2 0x000000010089c273 in NodeShape::~NodeShape (this=0x10e501c80) at NodeShape.cpp:43
> #3 0x000000010089910b in NodeGroup::destroy (this=0x10e501da0) at NodeGroup.cpp:61
> #4 0x00000001008990cd in NodeGroup::destroy (this=0x10e5014b0) at NodeGroup.cpp:59
> #5 0x00000001008990cd in NodeGroup::destroy (this=0x114e18da0) at NodeGroup.cpp:59
> #6 0x00000001007e6602 in Controller::ClearRootNode (this=0x114e19640) at Controller.cpp:329
> #7 0x00000001007ea52e in Controller::LoadMesh (this=0x114e19640, re=0x10aba4638, srl=0x1140f5258) at Controller.cpp:302
> #8 0x00000001008030ad in prepare (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:302
> #9 0x000000010080457a in FRS_do_stroke_rendering (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:600
> #10 0x00000001006aeb9d in add_freestyle (re=0x10aba4638) at pipeline.c:1584
> #11 0x00000001006aceb7 in do_render_3d (re=0x10aba4638) at pipeline.c:1094
> #12 0x00000001006ae061 in do_render_fields_blur_3d (re=0x10aba4638) at pipeline.c:1367
> #13 0x00000001006afa16 in do_render_composite_fields_blur_3d (re=0x10aba4638) at pipeline.c:1815
> #14 0x00000001006b04e4 in do_render_all_options (re=0x10aba4638) at pipeline.c:2021
> ----------------------------------------------------------------------
>
> Apparently a name conflict between the two Blender modules is taking place.
> The present commit hence intends to address it by putting all the Freestyle C++
> classes in the namespace 'Freestyle'. This revision will also prevent potential
> name conflicts with other Blender modules in the future.
>
> Special thanks to Lukas Toenne for the help with C++ namespace.
>
> Modified Paths:
> --------------
> trunk/blender/source/blender/freestyle/intern/application/AppCanvas.cpp
> trunk/blender/source/blender/freestyle/intern/application/AppCanvas.h
> trunk/blender/source/blender/freestyle/intern/application/AppConfig.cpp
> trunk/blender/source/blender/freestyle/intern/application/AppConfig.h
> trunk/blender/source/blender/freestyle/intern/application/AppView.cpp
> trunk/blender/source/blender/freestyle/intern/application/AppView.h
> trunk/blender/source/blender/freestyle/intern/application/Controller.cpp
> trunk/blender/source/blender/freestyle/intern/application/Controller.h
> trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
> trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
> trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
> 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.cpp
> trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
> trunk/blender/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/BBox.h
> trunk/blender/source/blender/freestyle/intern/geometry/Bezier.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/Bezier.h
> trunk/blender/source/blender/freestyle/intern/geometry/FastGrid.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/FastGrid.h
> trunk/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/FitCurve.h
> trunk/blender/source/blender/freestyle/intern/geometry/Geom.h
> trunk/blender/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/GeomCleaner.h
> trunk/blender/source/blender/freestyle/intern/geometry/GeomUtils.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/GeomUtils.h
> trunk/blender/source/blender/freestyle/intern/geometry/Grid.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/Grid.h
> trunk/blender/source/blender/freestyle/intern/geometry/GridHelpers.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/GridHelpers.h
> trunk/blender/source/blender/freestyle/intern/geometry/HashGrid.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/HashGrid.h
> trunk/blender/source/blender/freestyle/intern/geometry/Noise.cpp
> 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/matrix_util.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/matrix_util.h
> trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.cpp
> trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h
> trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.cpp
> trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
> trunk/blender/source/blender/freestyle/intern/image/Image.h
> trunk/blender/source/blender/freestyle/intern/image/ImagePyramid.cpp
> trunk/blender/source/blender/freestyle/intern/image/ImagePyramid.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_BBox.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
> trunk/blender/source/blender/freestyle/intern/python/BPy_Convert.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_FrsNoise.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_Id.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_IntegrationType.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_Interface0D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_Interface1D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_Iterator.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_MediumType.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_Nature.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_Operators.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_SShape.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_StrokeShader.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_ViewMap.h
> trunk/blender/source/blender/freestyle/intern/python/BPy_ViewShape.h
> trunk/blender/source/blender/freestyle/intern/python/Director.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.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/LineRep.cpp
> 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.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeCamera.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeGroup.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeLight.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeLight.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeShape.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/NodeTransform.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/Rep.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/TriangleRep.h
> trunk/blender/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
> trunk/blender/source/blender/freestyle/intern/scene_graph/VertexRep.h
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
> trunk/blender/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
> trunk/blender/source/blender/freestyle/intern/stroke/Canvas.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/Canvas.h
> trunk/blender/source/blender/freestyle/intern/stroke/Chain.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/Chain.h
> trunk/blender/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/ChainingIterators.h
> trunk/blender/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/ContextFunctions.h
> trunk/blender/source/blender/freestyle/intern/stroke/Curve.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/Curve.h
> trunk/blender/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
> trunk/blender/source/blender/freestyle/intern/stroke/CurveIterators.h
> trunk/blender/source/blender/freestyle/intern/stroke/Modifiers.h
> trunk/blender/source/blender/freestyle/intern/stroke/Module.h
> trunk/blender/source/blender/freestyle/intern/stroke/Operators.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/Operators.h
> trunk/blender/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
> trunk/blender/source/blender/freestyle/intern/stroke/Predicates0D.h
> trunk/blender/source/blender/freestyle/intern/stroke/Predicates1D.h
> trunk/blender/source/blender/freestyle/intern/stroke/QInformationMap.h
> trunk/blender/source/blender/freestyle/intern/stroke/Stroke.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeIO.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeIO.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeIterators.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeLayer.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeRenderer.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeShader.h
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/StrokeTesselator.h
> trunk/blender/source/blender/freestyle/intern/stroke/StyleModule.h
> trunk/blender/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
> trunk/blender/source/blender/freestyle/intern/stroke/TextStrokeRenderer.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/Cast.h
> trunk/blender/source/blender/freestyle/intern/system/Exception.cpp
> trunk/blender/source/blender/freestyle/intern/system/Exception.h
> trunk/blender/source/blender/freestyle/intern/system/FreestyleConfig.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/Iterator.h
> trunk/blender/source/blender/freestyle/intern/system/PointerSequence.h
> trunk/blender/source/blender/freestyle/intern/system/Precision.h
> trunk/blender/source/blender/freestyle/intern/system/ProgressBar.h
> trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.cpp
> trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.h
> trunk/blender/source/blender/freestyle/intern/system/PythonInterpreter.cpp
> trunk/blender/source/blender/freestyle/intern/system/PythonInterpreter.h
> trunk/blender/source/blender/freestyle/intern/system/RandGen.cpp
> 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/StringUtils.cpp
> trunk/blender/source/blender/freestyle/intern/system/StringUtils.h
> trunk/blender/source/blender/freestyle/intern/system/TimeStamp.cpp
> 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/ArbitraryGridDensityProvider.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
> trunk/blender/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
> trunk/blender/source/blender/freestyle/intern/view_map/BoxGrid.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/BoxGrid.h
> trunk/blender/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/CulledOccluderSource.h
> trunk/blender/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
> trunk/blender/source/blender/freestyle/intern/view_map/Functions0D.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/Functions0D.h
> trunk/blender/source/blender/freestyle/intern/view_map/Functions1D.cpp
> 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/HeuristicGridDensityProviderFactory.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h
> trunk/blender/source/blender/freestyle/intern/view_map/Interface0D.h
> trunk/blender/source/blender/freestyle/intern/view_map/Interface1D.h
> trunk/blender/source/blender/freestyle/intern/view_map/OccluderSource.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/OccluderSource.h
> trunk/blender/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h
> trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.h
> trunk/blender/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
> trunk/blender/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/SphericalGrid.h
> trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMap.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMap.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIO.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapIterators.h
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
> trunk/blender/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/Curvature.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/Curvature.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/Nature.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/WEdge.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/WEdge.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/WFillGrid.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdge.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
> trunk/blender/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
> trunk/blender/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
> trunk/blender/source/blender/makesdna/DNA_freestyle_types.h
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/AppCanvas.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/AppCanvas.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/AppCanvas.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -33,6 +33,8 @@
>
> #include "../system/StringUtils.h"
>
> +namespace Freestyle {
> +
> AppCanvas::AppCanvas()
> :Canvas()
> {
> @@ -205,7 +207,8 @@
> iStroke->Render(_Renderer);
> }
>
> -
> void AppCanvas::update()
> {
> }
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/AppCanvas.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/AppCanvas.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/AppCanvas.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -28,6 +28,8 @@
> #include "../stroke/Canvas.h"
> #include "AppView.h"
>
> +namespace Freestyle {
> +
> class AppCanvas : public Canvas
> {
> public:
> @@ -91,4 +93,6 @@
> } _pass_diffuse, _pass_z;
> };
>
> +} /* namespace Freestyle */
> +
> #endif // __APPCANVAS_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/AppConfig.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/AppConfig.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/AppConfig.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -33,6 +33,8 @@
> #include "BLI_path_util.h"
> }
>
> +namespace Freestyle {
> +
> namespace Config {
>
> Path *Path::_pInstance = 0;
> @@ -95,3 +97,5 @@
> }
>
> } // End of namepace Config
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/AppConfig.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/AppConfig.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/AppConfig.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -34,6 +34,8 @@
>
> using namespace std;
>
> +namespace Freestyle {
> +
> namespace Config {
>
> class Path {
> @@ -98,4 +100,6 @@
>
> } // End of namepace Config
>
> +} /* namespace Freestyle */
> +
> #endif // __APP_CONFIG_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/AppView.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/AppView.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/AppView.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -56,6 +56,8 @@
> #include "FRS_freestyle.h"
> }
>
> +namespace Freestyle {
> +
> AppView::AppView(const char *iName)
> {
> _Fovy = DEG2RADF(30.0f);
> @@ -189,3 +191,5 @@
> real Near = std::max(0.1, (real)(-2.0f * _maxAbs + distanceToSceneCenter()));
> return Near;
> }
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/AppView.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/AppView.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/AppView.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -31,6 +31,8 @@
> #include "../scene_graph/NodeDrawingStyle.h"
> #include "../system/Precision.h"
>
> +namespace Freestyle {
> +
> using namespace Geometry;
>
> class AppView
> @@ -228,4 +230,6 @@
> NodeDrawingStyle *_p2DSelectionNode;
> };
>
> +} /* namespace Freestyle */
> +
> #endif // __APPVIEW_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/Controller.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/Controller.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/Controller.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -63,19 +63,11 @@
>
> #include "BKE_global.h"
>
> -// XXX Not inside an "extern C" block???
> #include "DNA_freestyle_types.h"
>
> -// XXX Are those "ifdef __cplusplus" useful here?
> -#ifdef __cplusplus
> -extern "C" {
> -#endif
> -
> #include "FRS_freestyle.h"
>
> -#ifdef __cplusplus
> -}
> -#endif
> +namespace Freestyle {
>
> Controller::Controller()
> {
> @@ -1043,3 +1035,5 @@
> setPassDiffuse(NULL, 0, 0);
> setPassZ(NULL, 0, 0);
> }
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/application/Controller.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/application/Controller.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/application/Controller.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -40,6 +40,13 @@
> #include "../view_map/FEdgeXDetector.h"
> #include "../view_map/ViewMapBuilder.h"
>
> +extern "C" {
> +#include "render_types.h"
> +#include "DNA_scene_types.h"
> +}
> +
> +namespace Freestyle {
> +
> class AppView;
> class NodeGroup;
> class WShape;
> @@ -51,18 +58,6 @@
> class Shader;
> class StrokeRenderer;
>
> -// XXX Are those "ifdef __cplusplus" useful here?
> -#ifdef __cplusplus
> -extern "C" {
> -#endif
> -
> -#include "render_types.h"
> -#include "DNA_scene_types.h"
> -
> -#ifdef __cplusplus
> -}
> -#endif
> -
> class Controller
> {
> public:
> @@ -247,4 +242,6 @@
>
> extern Controller *g_pController;
>
> +} /* namespace Freestyle */
> +
> #endif // __CONTROLLER_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -28,6 +28,8 @@
>
> #include "BKE_global.h"
>
> +namespace Freestyle {
> +
> BlenderFileLoader::BlenderFileLoader(Render *re, SceneRenderLayer *srl)
> {
> _re = re;
> @@ -756,3 +758,5 @@
> currentMesh->AddChild(shape);
> _Scene->AddChild(currentMesh);
> }
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -39,11 +39,7 @@
> #include "../system/FreestyleConfig.h"
> #include "../system/RenderMonitor.h"
>
> -// XXX Are those "ifdef __cplusplus" useful here?
> -#ifdef __cplusplus
> extern "C" {
> -#endif
> -
> #include "DNA_material_types.h"
> #include "DNA_meshdata_types.h"
> #include "DNA_scene_types.h"
> @@ -55,11 +51,9 @@
> #include "BKE_scene.h"
>
> #include "BLI_math.h"
> -
> -#ifdef __cplusplus
> }
> -#endif
>
> +namespace Freestyle {
>
> class NodeGroup;
>
> @@ -128,4 +122,6 @@
> RenderMonitor *_pRenderMonitor;
> };
>
> +} /* namespace Freestyle */
> +
> #endif // __BLENDER_FILE_LOADER_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -60,6 +60,8 @@
> }
> #endif
>
> +namespace Freestyle {
> +
> BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : StrokeRenderer()
> {
> // TEMPORARY - need a texture manager
> @@ -510,3 +512,5 @@
> RE_RenderFreestyleStrokes(freestyle_render, G.main, freestyle_scene);
> return freestyle_render;
> }
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -28,20 +28,15 @@
> #include "../stroke/StrokeRenderer.h"
> #include "../system/FreestyleConfig.h"
>
> -// XXX Are those "ifdef __cplusplus" useful here?
> -#ifdef __cplusplus
> extern "C" {
> -#endif
> -
> #include "DNA_material_types.h"
> #include "DNA_scene_types.h"
>
> #include "render_types.h"
> -
> -#ifdef __cplusplus
> }
> -#endif
>
> +namespace Freestyle {
> +
> class LIB_STROKE_EXPORT BlenderStrokeRenderer : public StrokeRenderer
> {
> public:
> @@ -68,4 +63,6 @@
> unsigned int get_stroke_mesh_id(void) const;
> };
>
> +} /* namespace Freestyle */
> +
> #endif // __BLENDER_STROKE_RENDERER_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -34,6 +34,8 @@
> #include "BKE_text.h"
> }
>
> +namespace Freestyle {
> +
> class BlenderStyleModule : public StyleModule
> {
> public:
> @@ -58,4 +60,6 @@
> struct Text *_text;
> };
>
> +} /* namespace Freestyle */
> +
> #endif // __BLENDERSTYLEMODULE_H__
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp
> ===================================================================
> --- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp 2013-04-09 00:42:01 UTC (rev 55914)
> +++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp 2013-04-09 00:46:49 UTC (rev 55915)
> @@ -26,6 +26,8 @@
>
> #include "BKE_global.h"
>
> +namespace Freestyle {
> +
> BlenderTextureManager::BlenderTextureManager()
> : TextureManager()
> {
> @@ -95,3 +97,5 @@
> return 0;
> #endif
> }
> +
> +} /* namespace Freestyle */
>
> Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
> ===================================================================
>
> @@ Diff output truncated at 10240 characters. @@
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
More information about the Bf-committers
mailing list