diff options
Diffstat (limited to 'source/blender/freestyle/intern/application/Controller.h')
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 3ac3ba0654c..ff9a85f8041 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -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 InteractiveShader; 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 @@ private: extern Controller *g_pController; +} /* namespace Freestyle */ + #endif // __CONTROLLER_H__ |