diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-19 18:03:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-19 18:03:02 +0400 |
| commit | dd96bf6168b60639701dd0ff512806e3fe1b65d0 (patch) | |
| tree | 3873125b4f2d05eddfd25cc9e954c6a53149a60b /source/blender/editors/space_buttons | |
| parent | 51f11abe45097cbba59626ede06c3832bcc522e2 (diff) | |
- added xmirror to the weightpaint options
- made texture_slot return the texture slot for the node texture
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 504e4a6866e..bc0cc536857 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -622,7 +622,9 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r PointerRNA *ptr; if((ptr=get_pointer_type(path, &RNA_Material))) { - Material *ma= ptr->data; + Material *ma= ptr->data; /* should this be made a different option? */ + Material *ma_node= give_node_material(ma); + ma= ma_node?ma_node:ma; if(ma) CTX_data_pointer_set(result, &ma->id, &RNA_MaterialTextureSlot, ma->mtex[(int)ma->texact]); |