griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5: small fix to get context.texture_slot as the right

Browse Source 
Material/World/LampTextureSlot type.
This commit is contained in:
Brecht Van Lommel
2009-06-08 16:55:43 +00:00
parent 62160cef8a
commit cd6ace5c16
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_buttons/buttons_context.c
View File

@@ -542,19 +542,19 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
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;