diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-14 13:43:53 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-14 13:43:53 +0300 |
commit | fffbb2c7ebb2b7d3a0c20e9b04fa4132a070afb3 (patch) | |
tree | 0f5bd9bcc5c4527b869556044f93805beb107bb0 /source | |
parent | e8c4be18a84456301204f27082aed9bd8933eb77 (diff) |
Fix [#20671] No access to creating textures for a material
Caused by my previous commit here.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index c689e994c17..39990df34a7 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -339,10 +339,10 @@ static int buttons_context_path_texture(const bContext *C, ButsContextPath *path return 1; } /* try brush */ - if(buttons_context_path_brush(C, path)) { + if((path->flag & SB_BRUSH_TEX) && buttons_context_path_brush(C, path)) { br= path->ptr[path->len-1].data; - if(br && (path->flag & SB_BRUSH_TEX)) { + if(br) { tex= give_current_brush_texture(br); RNA_id_pointer_create(&tex->id, &path->ptr[path->len]); |