From 8a183aa26bc34fe441ba1ad3e5f2c307ed54f6b7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Mar 2015 03:16:55 +1100 Subject: Cleanup: use BKE_texture_ prefix --- source/blender/blenkernel/BKE_texture.h | 64 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'source/blender/blenkernel/BKE_texture.h') diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index 03ddbb706d7..ad485931ee3 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -61,8 +61,6 @@ struct World; #define MAXCOLORBAND 32 -void BKE_texture_free(struct Tex *t); - void init_colorband(struct ColorBand *coba, bool rangetype); struct ColorBand *add_colorband(bool rangetype); bool do_colorband(const struct ColorBand *coba, float in, float out[4]); @@ -71,15 +69,17 @@ struct CBData *colorband_element_add(struct ColorBand *coba, float position); int colorband_element_remove(struct ColorBand *coba, int index); void colorband_update_sort(struct ColorBand *coba); -void default_tex(struct Tex *tex); -struct Tex *add_texture(struct Main *bmain, const char *name); -void tex_set_type(struct Tex *tex, int type); -void default_mtex(struct MTex *mtex); -struct MTex *add_mtex(void); -struct MTex *add_mtex_id(struct ID *id, int slot); -struct Tex *BKE_texture_copy(struct Tex *tex); -struct Tex *localize_texture(struct Tex *tex); -void BKE_texture_make_local(struct Tex *tex); +void BKE_texture_free(struct Tex *tex); +void BKE_texture_default(struct Tex *tex); +struct Tex *BKE_texture_copy(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 Tex *tex); +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 */ // void autotexname(struct Tex *tex); @@ -105,32 +105,32 @@ void set_current_particle_texture(struct ParticleSettings *part, struct Tex *tex bool has_current_material_texture(struct Material *ma); -struct TexMapping *add_tex_mapping(int type); -void default_tex_mapping(struct TexMapping *texmap, int type); -void init_tex_mapping(struct TexMapping *texmap); +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); + +struct ColorMapping *BKE_texture_colormapping_add(void); +void BKE_texture_colormapping_default(struct ColorMapping *colormap); -struct ColorMapping *add_color_mapping(void); -void default_color_mapping(struct ColorMapping *colormap); +void BKE_texture_envmap_free_data(struct EnvMap *env); +void BKE_texture_envmap_free(struct EnvMap *env); +struct EnvMap *BKE_texture_envmap_add(void); +struct EnvMap *BKE_texture_envmap_copy(struct EnvMap *env); -void BKE_free_envmapdata(struct EnvMap *env); -void BKE_free_envmap(struct EnvMap *env); -struct EnvMap *BKE_add_envmap(void); -struct EnvMap *BKE_copy_envmap(struct EnvMap *env); +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(struct PointDensity *pd); -void BKE_free_pointdensitydata(struct PointDensity *pd); -void BKE_free_pointdensity(struct PointDensity *pd); -struct PointDensity *BKE_add_pointdensity(void); -struct PointDensity *BKE_copy_pointdensity(struct PointDensity *pd); +void BKE_texture_voxeldata_free_data(struct VoxelData *vd); +void BKE_texture_voxeldata_free(struct VoxelData *vd); +struct VoxelData *BKE_texture_voxeldata_add(void); +struct VoxelData *BKE_texture_voxeldata_copy(struct VoxelData *vd); -void BKE_free_voxeldatadata(struct VoxelData *vd); -void BKE_free_voxeldata(struct VoxelData *vd); -struct VoxelData *BKE_add_voxeldata(void); -struct VoxelData *BKE_copy_voxeldata(struct VoxelData *vd); +void BKE_texture_ocean_free(struct OceanTex *ot); +struct OceanTex *BKE_texture_ocean_add(void); +struct OceanTex *BKE_texture_ocean_copy(struct OceanTex *ot); -void BKE_free_oceantex(struct OceanTex *ot); -struct OceanTex *BKE_add_oceantex(void); -struct OceanTex *BKE_copy_oceantex(struct OceanTex *ot); - bool BKE_texture_dependsOnTime(const struct Tex *texture); bool BKE_texture_is_image_user(const struct Tex *tex); -- cgit v1.2.3