Cleanup: Render Module: move header files to main directory

Move headers files from `render/extern/` to `render/`

Part of T73586

31 files changed, 32 insertions, 31 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 97281dbccf0..a64662f29a0 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -39,7 +39,7 @@ set(INC
   ../sequencer
   ../shader_fx
   ../simulation
-  ../render/extern/include
+  ../render
   ../../../intern/ghost
   ../../../intern/glew-mx
   ../../../intern/guardedalloc
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 833a5abb630..b65a3c4d58e 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -30,7 +30,7 @@ set(INC
   ../makesdna
   ../makesrna
   ../nodes
-  ../render/extern/include
+  ../render
   ../sequencer
   ../windowmanager
   ../../../intern/clog
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 54dd121952b..fd7e15bae44 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -34,7 +34,7 @@ set(INC
   ../windowmanager
   ../nodes/composite
   ../nodes/intern
-  ../render/extern/include
+  ../render
   ../render/intern/include
   ../../../extern/clew/include
   ../../../intern/atomic
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 665cc11c5a0..d55790986a8 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -36,7 +36,7 @@ set(INC
   ../makesdna
   ../makesrna
   ../nodes
-  ../render/extern/include
+  ../render
   ../render/intern/include
   ../windowmanager
 
diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt
index f9c08727128..96f0dfcdb9f 100644
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -22,7 +22,7 @@ set(INC
   ../../depsgraph
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/guardedalloc
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 035af772a55..35bf295a678 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -28,7 +28,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index 72105ddb00a..4e600dc0277 100644
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -22,7 +22,7 @@ set(INC
   ../../depsgraph
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/guardedalloc
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 2f72f563e68..e4991f31649 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -32,7 +32,7 @@ set(INC
   ../../modifiers
   ../../python
   ../../shader_fx
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index b39dbf74375..46afa390997 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -28,7 +28,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../sequencer
   ../../windowmanager
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 930f9890dd9..9bf3d2610d8 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -28,7 +28,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/atomic
   ../../../../intern/clog
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index dcacf5e2504..993a52b9084 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -26,7 +26,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/atomic
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 96aab8b5d1a..7a1bab0ef14 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -28,7 +28,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index fc831bf8490..8836c43cd05 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -27,7 +27,7 @@ set(INC
   ../../makesdna
   ../../makesrna
   ../../nodes
-  ../../render/extern/include
+  ../../render
   ../../compositor
   ../../windowmanager
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index f4d6f7e322c..0371b4e271f 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -27,7 +27,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../depsgraph
   ../../windowmanager
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 5bf8450246b..73d6a376da6 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -26,7 +26,7 @@ set(INC
   ../../ikplugin
   ../../makesdna
   ../../makesrna
-  ../../render/extern/include
+  ../../render
   ../../depsgraph
   ../../sequencer
   ../../windowmanager
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt
index 8270476e9dd..7984558f989 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -565,7 +565,7 @@ set(INC
   ../makesrna
   ../python
   ../python/intern
-  ../render/extern/include
+  ../render
   ../render/intern/include
   ../../../extern/glew/include
   ../../../intern/guardedalloc
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index cb4d74559a4..9f1484b47c0 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INC
   ../editors/include
   ../makesdna
   ../makesrna
-  ../render/extern/include
+  ../render
   ../windowmanager
   ../../../intern/eigen
   ../../../intern/guardedalloc
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index bd015f3e477..d638d6f66cc 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -378,7 +378,7 @@ blender_include_dirs(
   ../../simulation
   ../../windowmanager
   ../../editors/include
-  ../../render/extern/include
+  ../../render
   ../../../../intern/cycles/blender
   ../../../../intern/atomic
   ../../../../intern/glew-mx
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 65024e46a2b..549751ce267 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INC
   ../editors/include
   ../makesdna
   ../makesrna
-  ../render/extern/include
+  ../render
   ../windowmanager
   ../../../intern/eigen
   ../../../intern/guardedalloc
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 78b3e6236f0..f88d50167ac 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -35,7 +35,7 @@ set(INC
   ../imbuf
   ../makesdna
   ../makesrna
-  ../render/extern/include
+  ../render
   ../../../intern/glew-mx
   ../../../intern/guardedalloc
   ../../../intern/sky/include
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 41caee1a39c..03cd3dd9cbf 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 
 set(INC
-  extern/include
+  .
   intern/include
   ../blenkernel
   ../blenlib
@@ -53,12 +53,13 @@ set(SRC
   intern/source/render_texture.c
   intern/source/zbuf.c
 
-  extern/include/RE_bake.h
-  extern/include/RE_engine.h
-  extern/include/RE_multires_bake.h
-  extern/include/RE_pipeline.h
-  extern/include/RE_render_ext.h
-  extern/include/RE_shader_ext.h
+  RE_bake.h
+  RE_engine.h
+  RE_multires_bake.h
+  RE_pipeline.h
+  RE_render_ext.h
+  RE_shader_ext.h
+
   intern/include/initrender.h
   intern/include/render_result.h
   intern/include/render_types.h
diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/RE_bake.h
index 3ed41ede006..3ed41ede006 100644
--- a/source/blender/render/extern/include/RE_bake.h
+++ b/source/blender/render/RE_bake.h
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/RE_engine.h
index e53f33eacff..e53f33eacff 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/RE_engine.h
diff --git a/source/blender/render/extern/include/RE_multires_bake.h b/source/blender/render/RE_multires_bake.h
index fd200e85719..fd200e85719 100644
--- a/source/blender/render/extern/include/RE_multires_bake.h
+++ b/source/blender/render/RE_multires_bake.h
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index 4dd2b300700..4dd2b300700 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/RE_render_ext.h
index 76812840c91..76812840c91 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/RE_render_ext.h
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/RE_shader_ext.h
index d9d5a924949..d9d5a924949 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/RE_shader_ext.h
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 43a45fd896a..9efe23dd8c4 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -29,7 +29,7 @@ set(INC
   ../imbuf
   ../makesdna
   ../makesrna
-  ../render/extern/include
+  ../render
   ../blenfont
   ../windowmanager
   ../../../intern/atomic
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index a68b343d416..0167591c3ba 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INC
   ../editors/include
   ../makesdna
   ../makesrna
-  ../render/extern/include
+  ../render
   ../windowmanager
   ../../../intern/eigen
   ../../../intern/guardedalloc
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 7e13cef4a73..6de36acb343 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -36,7 +36,7 @@ set(INC
   ../makesdna
   ../makesrna
   ../nodes
-  ../render/extern/include
+  ../render
   ../sequencer
   ../../../intern/clog
   ../../../intern/ghost
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7f4f8d47688..b48f4bdd4b9 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -31,7 +31,7 @@ blender_include_dirs(
   ../blender/editors/include
   ../blender/imbuf
   ../blender/makesrna
-  ../blender/render/extern/include
+  ../blender/render
   ../blender/gpu
   ../blender/makesdna
   ../blender/windowmanager