diff options
Diffstat (limited to 'source/blender/freestyle')
6 files changed, 21 insertions, 17 deletions
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index 4cff11f4b4c..770ec8a1c2f 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -48,9 +48,13 @@ stroke_sources = env.Glob(prefix + '/*.cpp') prefix = 'intern/rendering' rendering_sources = env.Glob(prefix + '/GL*.cpp') -# app / app_blender -prefix = 'intern/app_blender' -app_sources = env.Glob(prefix + '/*.cpp') +# application +prefix = 'intern/application' +application_sources = env.Glob(prefix + '/*.cpp') + +# blender_interface +prefix = 'intern/blender_interface' +interface_sources = env.Glob(prefix + '/*.cpp') # Python prefix = 'intern/python' @@ -61,7 +65,7 @@ python_sources = env.Glob(prefix + '/*.cpp') \ sources = system_sources + image_sources + geometry_sources + scene_graph_sources \ + winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \ - + app_sources + python_sources + + application_sources + interface_sources + python_sources env.BlenderLib (libname="bf_freestyle", sources=sources, diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index b1ea43befef..89c0bde2cf5 100755 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -56,8 +56,8 @@ #include "../system/StringUtils.h" -#include "../scene_graph/BlenderFileLoader.h" -#include "../stroke/BlenderStrokeRenderer.h" +#include "../blender_interface/BlenderFileLoader.h" +#include "../blender_interface/BlenderStrokeRenderer.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index b17cde50443..e1a818b4a7f 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -5,10 +5,10 @@ # include <float.h> # include "../system/FreestyleConfig.h" -# include "NodeGroup.h" -# include "NodeTransform.h" -# include "NodeShape.h" -# include "IndexedFaceSet.h" +# include "../scene_graph/NodeGroup.h" +# include "../scene_graph/NodeTransform.h" +# include "../scene_graph/NodeShape.h" +# include "../scene_graph/IndexedFaceSet.h" # include "../geometry/BBox.h" # include "../geometry/Geom.h" # include "../geometry/GeomCleaner.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 0be4fce4467..3759a1206a8 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -1,6 +1,6 @@ # include "BlenderStrokeRenderer.h" -# include "Canvas.h" -# include "../app_blender/AppConfig.h" +# include "../stroke/Canvas.h" +# include "../application/AppConfig.h" # include "../rendering/GLStrokeRenderer.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index eafd58e0bab..b8de204881a 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -2,7 +2,7 @@ # define BLENDERSTROKERENDERER_H # include "../system/FreestyleConfig.h" -# include "StrokeRenderer.h" +# include "../stroke/StrokeRenderer.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index b88e750687e..74c9e377a15 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -1,7 +1,7 @@ -#include "AppView.h" -#include "Controller.h" -#include "AppConfig.h" -#include "AppCanvas.h" +#include "../application/AppView.h" +#include "../application/Controller.h" +#include "../application/AppConfig.h" +#include "../application/AppCanvas.h" #include <iostream> #include <map> |