[Bf-blender-cvs] [580ff2cb937] master: Cleanup: Render Module: combine intern/ source & include

[Aaron Carlisle]

Commit: 580ff2cb937daf43699908afe1190baea8d117aa
Author: Aaron Carlisle
Date:   Fri Nov 6 10:36:51 2020 -0500
Branches: master
https://developer.blender.org/rB580ff2cb937daf43699908afe1190baea8d117aa

Cleanup: Render Module: combine intern/ source & include

===================================================================

M	source/blender/compositor/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/freestyle/CMakeLists.txt
M	source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M	source/blender/render/CMakeLists.txt
R100	source/blender/render/intern/source/bake_api.c	source/blender/render/intern/bake_api.c
R099	source/blender/render/intern/source/external_engine.c	source/blender/render/intern/external_engine.c
R100	source/blender/render/intern/source/imagetexture.c	source/blender/render/intern/imagetexture.c
R099	source/blender/render/intern/source/initrender.c	source/blender/render/intern/initrender.c
R100	source/blender/render/intern/include/initrender.h	source/blender/render/intern/initrender.h
R100	source/blender/render/intern/source/multires_bake.c	source/blender/render/intern/multires_bake.c
R099	source/blender/render/intern/source/pipeline.c	source/blender/render/intern/pipeline.c
R100	source/blender/render/intern/include/renderpipeline.h	source/blender/render/intern/pipeline.h
R100	source/blender/render/intern/source/pointdensity.c	source/blender/render/intern/pointdensity.c
R100	source/blender/render/intern/source/render_result.c	source/blender/render/intern/render_result.c
R100	source/blender/render/intern/include/render_result.h	source/blender/render/intern/render_result.h
R100	source/blender/render/intern/source/render_texture.c	source/blender/render/intern/render_texture.c
R100	source/blender/render/intern/include/render_types.h	source/blender/render/intern/render_types.h
R100	source/blender/render/intern/include/texture.h	source/blender/render/intern/texture.h
R100	source/blender/render/intern/source/zbuf.c	source/blender/render/intern/zbuf.c
R100	source/blender/render/intern/include/zbuf.h	source/blender/render/intern/zbuf.h

===================================================================

diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index fd7e15bae44..fec98f58261 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -35,7 +35,7 @@ set(INC
   ../nodes/composite
   ../nodes/intern
   ../render
-  ../render/intern/include
+  ../render/intern
   ../../../extern/clew/include
   ../../../intern/atomic
   ../../../intern/guardedalloc
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index d55790986a8..cefd52db66c 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -37,7 +37,7 @@ set(INC
   ../makesrna
   ../nodes
   ../render
-  ../render/intern/include
+  ../render/intern
   ../windowmanager
 
   ../../../intern/atomic
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt
index 7984558f989..b7eaf018dba 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -566,7 +566,7 @@ set(INC
   ../python
   ../python/intern
   ../render
-  ../render/intern/include
+  ../render/intern
   ../../../extern/glew/include
   ../../../intern/guardedalloc
 )
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index dbc0e94960a..9f1a1ecaace 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -59,7 +59,7 @@ using namespace Freestyle;
 
 #include "DEG_depsgraph_query.h"
 
-#include "renderpipeline.h"
+#include "pipeline.h"
 
 #include "FRS_freestyle.h"
 
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
similarity index 100%
rename from source/blender/render/intern/source/bake_api.c
rename to 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
similarity index 99%
rename from source/blender/render/intern/source/external_engine.c
rename to 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
similarity index 100%
rename from source/blender/render/intern/source/imagetexture.c
rename to source/blender/render/intern/imagetexture.c
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/initrender.c
similarity index 99%
rename from source/blender/render/intern/source/initrender.c
rename to 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
similarity index 100%
rename from source/blender/render/intern/include/initrender.h
rename to 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
similarity index 100%
rename from source/blender/render/intern/source/multires_bake.c
rename to source/blender/render/intern/multires_bake.c
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/pipeline.c
similarity index 99%
rename from source/blender/render/intern/source/pipeline.c
rename to 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
similarity index 100%
rename from source/blender/render/intern/include/renderpipeline.h
rename to source/blender/render/intern/pipeline.h
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/pointdensity.c
similarity index 100%
rename from source/blender/render/intern/source/pointdensity.c
rename to 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
similarity index 100%
rename from source/blender/render/intern/source/render_result.c
rename to 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
similarity index 100%
rename from source/blender/render/intern/include/render_result.h
rename to 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
similarity index 100%
rename from source/blender/render/intern/source/render_texture.c
rename to 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
similarity index 100%
rename from source/blender/render/intern/include/render_types.h
rename to source/blender/render/intern/render_types.h
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/texture.h
similarity index 100%
rename from source/blender/render/intern/include/texture.h
rename to source/blender/render/intern/texture.h
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/zbuf.c
similarity index 100%
rename from source/blender/render/intern/source/zbuf.c
rename to source/blender/render/intern/zbuf.c
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/zbuf.h
similarity index 100%
rename from source/blender/render/intern/include/zbuf.h
rename to source/blender/render/intern/zbuf.h