diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-11-06 22:16:27 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-11-06 22:20:44 +0300 |
commit | d2c102060d4489aa1fd68f6c33df4ba9c4add78b (patch) | |
tree | 3a97430346da7902200cd0012de570026cc01207 /source/blender/render | |
parent | b3e71ee09802e84d52b7b7aed0c10cecba852431 (diff) |
Cleanup: Rename render texture files to texture_*
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/render/RE_render_ext.h | 6 | ||||
-rw-r--r-- | source/blender/render/intern/texture_common.h (renamed from source/blender/render/intern/texture.h) | 2 | ||||
-rw-r--r-- | source/blender/render/intern/texture_image.c (renamed from source/blender/render/intern/imagetexture.c) | 2 | ||||
-rw-r--r-- | source/blender/render/intern/texture_pointdensity.c (renamed from source/blender/render/intern/pointdensity.c) | 2 | ||||
-rw-r--r-- | source/blender/render/intern/texture_procedural.c (renamed from source/blender/render/intern/render_texture.c) | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index e6aa4d1380c..6e229fd25b7 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -44,13 +44,13 @@ set(INC set(SRC 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/texture_image.c + intern/texture_pointdensity.c + intern/texture_procedural.c intern/zbuf.c RE_bake.h @@ -64,7 +64,7 @@ set(SRC intern/render_result.h intern/render_types.h intern/pipeline.h - intern/texture.h + intern/texture_common.h intern/zbuf.h ) diff --git a/source/blender/render/RE_render_ext.h b/source/blender/render/RE_render_ext.h index 76812840c91..28a22399892 100644 --- a/source/blender/render/RE_render_ext.h +++ b/source/blender/render/RE_render_ext.h @@ -35,7 +35,7 @@ struct MTex; extern "C" { #endif -/* render_texture.c */ +/* texture_procedural.c */ bool RE_texture_evaluate(const struct MTex *mtex, const float vec[3], const int thread, @@ -53,10 +53,10 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen void RE_texture_rng_init(void); void RE_texture_rng_exit(void); -/* imagetexture.c */ +/* texture_image.c */ void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float result[4]); -/* pointdensity.c */ +/* texture_pointdensity.c */ struct PointDensity; void RE_point_density_cache(struct Depsgraph *depsgraph, struct PointDensity *pd); diff --git a/source/blender/render/intern/texture.h b/source/blender/render/intern/texture_common.h index 44ad508fe33..b3a976c3fe0 100644 --- a/source/blender/render/intern/texture.h +++ b/source/blender/render/intern/texture_common.h @@ -79,7 +79,7 @@ struct ImagePool; struct Tex; struct TexResult; -/* imagetexture.h */ +/* texture_image.c */ int imagewraposa(struct Tex *tex, struct Image *ima, diff --git a/source/blender/render/intern/imagetexture.c b/source/blender/render/intern/texture_image.c index 31c169f621b..26d9f12c91e 100644 --- a/source/blender/render/intern/imagetexture.c +++ b/source/blender/render/intern/texture_image.c @@ -50,7 +50,7 @@ #include "RE_shader_ext.h" #include "render_types.h" -#include "texture.h" +#include "texture_common.h" static void boxsample(ImBuf *ibuf, float minx, diff --git a/source/blender/render/intern/pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index e730aeb263d..0e62eea5b11 100644 --- a/source/blender/render/intern/pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -54,7 +54,7 @@ #include "DEG_depsgraph_query.h" #include "render_types.h" -#include "texture.h" +#include "texture_common.h" #include "RE_render_ext.h" #include "RE_shader_ext.h" diff --git a/source/blender/render/intern/render_texture.c b/source/blender/render/intern/texture_procedural.c index ff9c462f603..7f93addb76d 100644 --- a/source/blender/render/intern/render_texture.c +++ b/source/blender/render/intern/texture_procedural.c @@ -55,7 +55,7 @@ #include "MEM_guardedalloc.h" #include "render_types.h" -#include "texture.h" +#include "texture_common.h" #include "RE_render_ext.h" #include "RE_shader_ext.h" |