diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-08 20:55:43 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-08 20:55:43 +0400 |
| commit | cd6ace5c162c4e563457fa6dafd60c09588ee8cf (patch) | |
| tree | 0795f5d7010e656238d6a2e44885177a93256d2b /source/blender/editors/space_buttons | |
| parent | 62160cef8accc4b1d4a908043990db15d48c6960 (diff) | |
2.5: small fix to get context.texture_slot as the right
Material/World/LampTextureSlot type.
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 67d7a58a033..255bee1bf5a 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -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; |