Cleanup: Render Module: move header files to main directory

Move headers files from `render/extern/` to `render/` Part of T73586
Referenced by issue #73586, Code Quality Day Tasks
2020-11-06 10:10:18 -05:00 · 2020-11-06 10:10:18 -05:00 · e15076b22f · 2023-10-04 09:42:55 +02:00
parent 235c309e5f
commit e15076b22f
31 changed files with 32 additions and 31 deletions
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/source/blender/render/extern/include/RE_bake.h
+++ b/source/blender/render/extern/include/RE_bake.h
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
--- a/source/blender/render/extern/include/RE_multires_bake.h
+++ b/source/blender/render/extern/include/RE_multires_bake.h
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
--- 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
--- 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
--- 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
--- 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