From f1a0df22df7b929601db58db5ecb77ed82bf8361 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 12 Oct 2009 13:12:45 +0000 Subject: Bugfix: texture nodes header was still showing wrong texture when using node materials. --- source/blender/makesrna/intern/rna_world.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'source/blender/makesrna/intern/rna_world.c') diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index b2ed90eef03..c0c9c1d6568 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -71,31 +71,15 @@ static PointerRNA rna_World_active_texture_get(PointerRNA *ptr) World *wo= (World*)ptr->data; Tex *tex; - tex= (wo->mtex[(int)wo->texact])? wo->mtex[(int)wo->texact]->tex: NULL; + tex= give_current_world_texture(wo); return rna_pointer_inherit_refine(ptr, &RNA_Texture, tex); } static void rna_World_active_texture_set(PointerRNA *ptr, PointerRNA value) { World *wo= (World*)ptr->data; - int act= wo->texact; - - if(wo->mtex[act] && wo->mtex[act]->tex) - id_us_min(&wo->mtex[act]->tex->id); - - if(value.data) { - if(!wo->mtex[act]) { - wo->mtex[act]= add_mtex(); - wo->mtex[act]->texco= TEXCO_VIEW; - } - - wo->mtex[act]->tex= value.data; - id_us_plus(&wo->mtex[act]->tex->id); - } - else if(wo->mtex[act]) { - MEM_freeN(wo->mtex[act]); - wo->mtex[act]= NULL; - } + + set_current_world_texture(wo, value.data); } static void rna_World_update(bContext *C, PointerRNA *ptr) -- cgit v1.2.3