diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_texture.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_texture.h')
-rw-r--r-- | source/blender/blenkernel/BKE_texture.h | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index bcd56c4f63d..c17db591981 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -46,17 +46,19 @@ struct bNode; /* in ColorBand struct */ #define MAXCOLORBAND 32 - -void BKE_texture_free(struct Tex *tex); -void BKE_texture_default(struct Tex *tex); -void BKE_texture_copy_data(struct Main *bmain, struct Tex *tex_dst, const struct Tex *tex_src, const int flag); -struct Tex *BKE_texture_copy(struct Main *bmain, const struct Tex *tex); -struct Tex *BKE_texture_add(struct Main *bmain, const char *name); -struct Tex *BKE_texture_localize(struct Tex *tex); -void BKE_texture_make_local(struct Main *bmain, struct Tex *tex, const bool lib_local); -void BKE_texture_type_set(struct Tex *tex, int type); - -void BKE_texture_mtex_default(struct MTex *mtex); +void BKE_texture_free(struct Tex *tex); +void BKE_texture_default(struct Tex *tex); +void BKE_texture_copy_data(struct Main *bmain, + struct Tex *tex_dst, + const struct Tex *tex_src, + const int flag); +struct Tex *BKE_texture_copy(struct Main *bmain, const struct Tex *tex); +struct Tex *BKE_texture_add(struct Main *bmain, const char *name); +struct Tex *BKE_texture_localize(struct Tex *tex); +void BKE_texture_make_local(struct Main *bmain, struct Tex *tex, const bool lib_local); +void BKE_texture_type_set(struct Tex *tex, int type); + +void BKE_texture_mtex_default(struct MTex *mtex); struct MTex *BKE_texture_mtex_add(void); struct MTex *BKE_texture_mtex_add_id(struct ID *id, int slot); /* UNUSED */ @@ -74,30 +76,33 @@ void set_current_linestyle_texture(struct FreestyleLineStyle *linestyle, struct void set_current_particle_texture(struct ParticleSettings *part, struct Tex *tex); struct TexMapping *BKE_texture_mapping_add(int type); -void BKE_texture_mapping_default(struct TexMapping *texmap, int type); -void BKE_texture_mapping_init(struct TexMapping *texmap); +void BKE_texture_mapping_default(struct TexMapping *texmap, int type); +void BKE_texture_mapping_init(struct TexMapping *texmap); struct ColorMapping *BKE_texture_colormapping_add(void); -void BKE_texture_colormapping_default(struct ColorMapping *colormap); +void BKE_texture_colormapping_default(struct ColorMapping *colormap); -void BKE_texture_pointdensity_init_data(struct PointDensity *pd); -void BKE_texture_pointdensity_free_data(struct PointDensity *pd); -void BKE_texture_pointdensity_free(struct PointDensity *pd); +void BKE_texture_pointdensity_init_data(struct PointDensity *pd); +void BKE_texture_pointdensity_free_data(struct PointDensity *pd); +void BKE_texture_pointdensity_free(struct PointDensity *pd); struct PointDensity *BKE_texture_pointdensity_add(void); struct PointDensity *BKE_texture_pointdensity_copy(const struct PointDensity *pd, const int flag); -bool BKE_texture_dependsOnTime(const struct Tex *texture); -bool BKE_texture_is_image_user(const struct Tex *tex); - -void BKE_texture_get_value_ex( - const struct Scene *scene, struct Tex *texture, - float *tex_co, struct TexResult *texres, - struct ImagePool *pool, - bool use_color_management); - -void BKE_texture_get_value( - const struct Scene *scene, struct Tex *texture, - float *tex_co, struct TexResult *texres, bool use_color_management); +bool BKE_texture_dependsOnTime(const struct Tex *texture); +bool BKE_texture_is_image_user(const struct Tex *tex); + +void BKE_texture_get_value_ex(const struct Scene *scene, + struct Tex *texture, + float *tex_co, + struct TexResult *texres, + struct ImagePool *pool, + bool use_color_management); + +void BKE_texture_get_value(const struct Scene *scene, + struct Tex *texture, + float *tex_co, + struct TexResult *texres, + bool use_color_management); void BKE_texture_fetch_images_for_pool(struct Tex *texture, struct ImagePool *pool); |