[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20737] branches/blender2.5/blender/source /blender/editors/space_buttons/buttons_context.c: 2.5: small fix to get context.texture_slot as the right
Brecht Van Lommel
brecht at blender.org
Mon Jun 8 18:55:44 CEST 2009
Revision: 20737
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20737
Author: blendix
Date: 2009-06-08 18:55:43 +0200 (Mon, 08 Jun 2009)
Log Message:
-----------
2.5: small fix to get context.texture_slot as the right
Material/World/LampTextureSlot type.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c 2009-06-08 16:48:12 UTC (rev 20736)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c 2009-06-08 16:55:43 UTC (rev 20737)
@@ -542,19 +542,19 @@
Material *ma= ptr->data;
if(ma)
- CTX_data_pointer_set(result, &ma->id, &RNA_TextureSlot, ma->mtex[(int)ma->texact]);
+ CTX_data_pointer_set(result, &ma->id, &RNA_MaterialTextureSlot, ma->mtex[(int)ma->texact]);
}
else if((ptr=get_pointer_type(path, &RNA_Lamp))) {
Lamp *la= ptr->data;
if(la)
- CTX_data_pointer_set(result, &la->id, &RNA_TextureSlot, la->mtex[(int)la->texact]);
+ CTX_data_pointer_set(result, &la->id, &RNA_LampTextureSlot, la->mtex[(int)la->texact]);
}
else if((ptr=get_pointer_type(path, &RNA_World))) {
World *wo= ptr->data;
if(wo)
- CTX_data_pointer_set(result, &wo->id, &RNA_TextureSlot, wo->mtex[(int)wo->texact]);
+ CTX_data_pointer_set(result, &wo->id, &RNA_WorldTextureSlot, wo->mtex[(int)wo->texact]);
}
else if((ptr=get_pointer_type(path, &RNA_Brush))) { /* how to get this into context? */
Brush *br= ptr->data;
More information about the Bf-blender-cvs
mailing list