diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-11-06 18:36:51 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-11-06 18:37:40 +0300 |
commit | 580ff2cb937daf43699908afe1190baea8d117aa (patch) | |
tree | b96880786126cebf91474f10f75cc9b68b61baa0 /source/blender/render/intern | |
parent | 90ac9770a4a9370f10932724487f8f58763fbbac (diff) |
Cleanup: Render Module: combine intern/ source & include
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/bake_api.c (renamed from source/blender/render/intern/source/bake_api.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/external_engine.c (renamed from source/blender/render/intern/source/external_engine.c) | 2 | ||||
-rw-r--r-- | source/blender/render/intern/imagetexture.c (renamed from source/blender/render/intern/source/imagetexture.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/initrender.c (renamed from source/blender/render/intern/source/initrender.c) | 2 | ||||
-rw-r--r-- | source/blender/render/intern/initrender.h (renamed from source/blender/render/intern/include/initrender.h) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/multires_bake.c (renamed from source/blender/render/intern/source/multires_bake.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/pipeline.c (renamed from source/blender/render/intern/source/pipeline.c) | 6 | ||||
-rw-r--r-- | source/blender/render/intern/pipeline.h (renamed from source/blender/render/intern/include/renderpipeline.h) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/pointdensity.c (renamed from source/blender/render/intern/source/pointdensity.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/render_result.c (renamed from source/blender/render/intern/source/render_result.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/render_result.h (renamed from source/blender/render/intern/include/render_result.h) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/render_texture.c (renamed from source/blender/render/intern/source/render_texture.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/render_types.h (renamed from source/blender/render/intern/include/render_types.h) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/texture.h (renamed from source/blender/render/intern/include/texture.h) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/zbuf.c (renamed from source/blender/render/intern/source/zbuf.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/zbuf.h (renamed from source/blender/render/intern/include/zbuf.h) | 0 |
16 files changed, 5 insertions, 5 deletions
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 |