Cleanup: Render Module: combine intern/ source & include

17 files changed, 21 insertions, 21 deletions

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 03cd3dd9cbf..46aff356932 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -42,16 +42,16 @@ set(INC
 
 
 set(SRC
-  intern/source/bake_api.c
-  intern/source/external_engine.c
-  intern/source/imagetexture.c
-  intern/source/initrender.c
-  intern/source/multires_bake.c
-  intern/source/pipeline.c
-  intern/source/pointdensity.c
-  intern/source/render_result.c
-  intern/source/render_texture.c
-  intern/source/zbuf.c
+  intern/bake_api.c
+  intern/external_engine.c
+  intern/imagetexture.c
+  intern/initrender.c
+  intern/multires_bake.c
+  intern/pipeline.c
+  intern/pointdensity.c
+  intern/render_result.c
+  intern/render_texture.c
+  intern/zbuf.c
 
   RE_bake.h
   RE_engine.h
@@ -60,12 +60,12 @@ set(SRC
   RE_render_ext.h
   RE_shader_ext.h
 
-  intern/include/initrender.h
-  intern/include/render_result.h
-  intern/include/render_types.h
-  intern/include/renderpipeline.h
-  intern/include/texture.h
-  intern/include/zbuf.h
+  intern/initrender.h
+  intern/render_result.h
+  intern/render_types.h
+  intern/pipeline.h
+  intern/texture.h
+  intern/zbuf.h
 )
 
 set(LIB
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/bake_api.c
index 6f5db4986f2..6f5db4986f2 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/bake_api.c
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/external_engine.c
index b2121816932..54d0224738f 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/external_engine.c
@@ -65,7 +65,7 @@
 #include "initrender.h"
 #include "render_result.h"
 #include "render_types.h"
-#include "renderpipeline.h"
+#include "pipeline.h"
 
 /* Render Engine Types */
 
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/imagetexture.c
index 31c169f621b..31c169f621b 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/imagetexture.c
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/initrender.c
index 7eeef79e527..bf353c88778 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/initrender.c
@@ -41,7 +41,7 @@
 
 /* this module */
 #include "render_types.h"
-#include "renderpipeline.h"
+#include "pipeline.h"
 
 /* Own includes */
 #include "initrender.h"
diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/initrender.h
index f5ac352752f..f5ac352752f 100644
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/initrender.h
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/multires_bake.c
index ea18f151e1e..ea18f151e1e 100644
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/multires_bake.c
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/pipeline.c
index edf627c4e54..5a398b7d5c3 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -90,8 +90,8 @@
 
 #include "SEQ_sequencer.h"
 
-#include "../../../windowmanager/WM_api.h"    /* XXX */
-#include "../../../windowmanager/wm_window.h" /* XXX */
+#include "../../windowmanager/WM_api.h"    /* XXX */
+#include "../../windowmanager/wm_window.h" /* XXX */
 #include "GPU_context.h"
 
 #ifdef WITH_FREESTYLE
@@ -104,7 +104,7 @@
 #include "initrender.h"
 #include "render_result.h"
 #include "render_types.h"
-#include "renderpipeline.h"
+#include "pipeline.h"
 
 /* render flow
  *
diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/pipeline.h
index 062df59bfd3..062df59bfd3 100644
--- a/source/blender/render/intern/include/renderpipeline.h
+++ b/source/blender/render/intern/pipeline.h
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/pointdensity.c
index e730aeb263d..e730aeb263d 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/pointdensity.c
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/render_result.c
index 990373bafa0..990373bafa0 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/render_result.c
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/render_result.h
index 5c487223e94..5c487223e94 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/render_result.h
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/render_texture.c
index ff9c462f603..ff9c462f603 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/render_texture.c
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/render_types.h
index 6be5fb4792c..6be5fb4792c 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/render_types.h
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/texture.h
index 44ad508fe33..44ad508fe33 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/texture.h
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/zbuf.c
index d74ab330dc2..d74ab330dc2 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/zbuf.c
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/zbuf.h
index 41fa15c594f..41fa15c594f 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/zbuf.h