diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 17:42:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 18:19:49 +0300 |
commit | 880b0f981dce558d0661c1b838753fb7a07945c1 (patch) | |
tree | 84860cc0ae2b49d0c3f4a85ee7367408eb34313e /source/blender/render/intern | |
parent | 4f66cf3b8bb02f2c7c7c235ad7039ba1aa43212a (diff) |
Cleanup: more renaming in the render/ module for consistency
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/bake.c (renamed from source/blender/render/intern/bake_api.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/engine.c (renamed from source/blender/render/intern/external_engine.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/multires_bake.c | 7 | ||||
-rw-r--r-- | source/blender/render/intern/pipeline.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/texture_image.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/texture_pointdensity.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/texture_procedural.c | 3 |
7 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/render/intern/bake_api.c b/source/blender/render/intern/bake.c index 6f5db4986f2..6f5db4986f2 100644 --- a/source/blender/render/intern/bake_api.c +++ b/source/blender/render/intern/bake.c diff --git a/source/blender/render/intern/external_engine.c b/source/blender/render/intern/engine.c index 9a3dc0d000c..9a3dc0d000c 100644 --- a/source/blender/render/intern/external_engine.c +++ b/source/blender/render/intern/engine.c diff --git a/source/blender/render/intern/multires_bake.c b/source/blender/render/intern/multires_bake.c index ea18f151e1e..a4f68419c67 100644 --- a/source/blender/render/intern/multires_bake.c +++ b/source/blender/render/intern/multires_bake.c @@ -46,7 +46,7 @@ #include "RE_multires_bake.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -111,6 +111,11 @@ typedef struct { const int *orig_index_mp_to_orig; } MNormalBakeData; +typedef struct BakeImBufuserData { + float *displacement_buffer; + char *mask_buffer; +} BakeImBufuserData; + static void multiresbake_get_normal(const MResolvePixelData *data, float norm[], const int tri_num, diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c index 1bc6a056cda..3d19e5e6c15 100644 --- a/source/blender/render/intern/pipeline.c +++ b/source/blender/render/intern/pipeline.c @@ -86,7 +86,7 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "SEQ_sequencer.h" diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c index 26d9f12c91e..cd34226920d 100644 --- a/source/blender/render/intern/texture_image.c +++ b/source/blender/render/intern/texture_image.c @@ -46,8 +46,7 @@ #include "BKE_image.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "render_types.h" #include "texture_common.h" diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index 0e62eea5b11..e2568e0a013 100644 --- a/source/blender/render/intern/texture_pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -56,8 +56,7 @@ #include "render_types.h" #include "texture_common.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static ThreadMutex sample_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/source/blender/render/intern/texture_procedural.c b/source/blender/render/intern/texture_procedural.c index 7f93addb76d..a98f29a705d 100644 --- a/source/blender/render/intern/texture_procedural.c +++ b/source/blender/render/intern/texture_procedural.c @@ -57,8 +57,7 @@ #include "render_types.h" #include "texture_common.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static RNG_THREAD_ARRAY *random_tex_array; |