diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2006-11-06 04:08:26 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2006-11-06 04:08:26 +0300 |
| commit | 8e97a2955b2f99ec61189cb972c09676a013a60b (patch) | |
| tree | 89e67578ceac5a670a309b72295156cbfc7f05c7 /source/blender/src/header_buttonswin.c | |
| parent | 6feb2cc4f6d4c2131b959b77a8b87a5d7c9412a4 (diff) | |
Merged Google Summer of Code sculptmode/multires/retopo tools.
From the tracker:
https://projects.blender.org/tracker/index.php?func=detail&aid=5018&group_id=9&atid=127
Diffstat (limited to 'source/blender/src/header_buttonswin.c')
| -rw-r--r-- | source/blender/src/header_buttonswin.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/src/header_buttonswin.c b/source/blender/src/header_buttonswin.c index 6e45644fefe..84735a49ca6 100644 --- a/source/blender/src/header_buttonswin.c +++ b/source/blender/src/header_buttonswin.c @@ -323,10 +323,17 @@ void buttons_active_id(ID **id, ID **idfrom) } } else if(G.buts->texfrom==3) { - Brush *brush= G.scene->toolsettings->imapaint.brush; - if (brush) { - mtex= brush->mtex[brush->texact]; - if(mtex) *id= (ID*)mtex->tex; + if(G.f & G_SCULPTMODE) { + if(G.scene->sculptdata.texact != -1) { + mtex= G.scene->sculptdata.mtex[G.scene->sculptdata.texact]; + if(mtex) *id= (ID*)mtex->tex; + } + } else { + Brush *brush= G.scene->toolsettings->imapaint.brush; + if (brush) { + mtex= brush->mtex[brush->texact]; + if(mtex) *id= (ID*)mtex->tex; + } } } } |