diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-09 13:50:49 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-09 13:50:49 +0400 |
commit | 2226a5139a2ad78d4de2eaaf09e734adf1ce0ae4 (patch) | |
tree | 788e76978dcc715819544c2a3abce5636ed1d6e5 /source/blender/blenkernel/BKE_texture.h | |
parent | 9ebcd9c5e46c8addd80c8adb97fcee91a1916d57 (diff) |
Fix some issues with showing the current textures when using
material nodes and texture nodes. Made it all use the same
give_current_*_texture functions now.
Diffstat (limited to 'source/blender/blenkernel/BKE_texture.h')
-rw-r--r-- | source/blender/blenkernel/BKE_texture.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index a9862ba586b..407dc94adfa 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -31,17 +31,20 @@ #ifndef BKE_TEXTURE_H #define BKE_TEXTURE_H -struct Scene; -struct Tex; -struct MTex; -struct PluginTex; -struct LampRen; +struct Brush; struct ColorBand; -struct HaloRen; -struct TexMapping; struct EnvMap; +struct HaloRen; +struct Lamp; +struct LampRen; +struct Material; +struct MTex; +struct PluginTex; struct PointDensity; +struct Tex; +struct TexMapping; struct VoxelData; +struct World; /* in ColorBand struct */ #define MAXCOLORBAND 32 @@ -65,8 +68,12 @@ struct MTex *add_mtex(void); struct Tex *copy_texture(struct Tex *tex); void make_local_texture(struct Tex *tex); void autotexname(struct Tex *tex); -struct Tex *give_current_texture(struct Object *ob, int act); -struct Tex *give_current_world_texture(struct Scene *scene); + +struct Tex *give_current_object_texture(struct Object *ob); +struct Tex *give_current_material_texture(struct Material *ma); +struct Tex *give_current_lamp_texture(struct Lamp *la); +struct Tex *give_current_world_texture(struct World *world); +struct Tex *give_current_brush_texture(struct Brush *br); struct TexMapping *add_mapping(void); void init_mapping(struct TexMapping *texmap); |