diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-12 17:12:45 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-12 17:12:45 +0400 |
commit | f1a0df22df7b929601db58db5ecb77ed82bf8361 (patch) | |
tree | 106260cd3e3753debf685a0434078a3a3f1cf238 /source/blender/makesrna/intern/rna_lamp.c | |
parent | e36003e8e73e42e7b559d4cec19b9004d14fefa6 (diff) |
Bugfix: texture nodes header was still showing wrong texture
when using node materials.
Diffstat (limited to 'source/blender/makesrna/intern/rna_lamp.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 3d3333a7eed..88d9a496840 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -69,31 +69,15 @@ static PointerRNA rna_Lamp_active_texture_get(PointerRNA *ptr) Lamp *la= (Lamp*)ptr->data; Tex *tex; - tex= (la->mtex[(int)la->texact])? la->mtex[(int)la->texact]->tex: NULL; + tex= give_current_lamp_texture(la); return rna_pointer_inherit_refine(ptr, &RNA_Texture, tex); } static void rna_Lamp_active_texture_set(PointerRNA *ptr, PointerRNA value) { Lamp *la= (Lamp*)ptr->data; - int act= la->texact; - if(la->mtex[act] && la->mtex[act]->tex) - id_us_min(&la->mtex[act]->tex->id); - - if(value.data) { - if(!la->mtex[act]) { - la->mtex[act]= add_mtex(); - la->mtex[act]->texco= TEXCO_GLOB; - } - - la->mtex[act]->tex= value.data; - id_us_plus(&la->mtex[act]->tex->id); - } - else if(la->mtex[act]) { - MEM_freeN(la->mtex[act]); - la->mtex[act]= NULL; - } + set_current_lamp_texture(la, value.data); } static StructRNA* rna_Lamp_refine(struct PointerRNA *ptr) |