diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-04-19 02:13:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-19 02:13:22 +0400 |
| commit | 10a396d4b73f447457602e1b80d7725ef0cc89f5 (patch) | |
| tree | bdf0f232492bd31cc863e6588a84bc3891d7c971 /source/blender/src/buttons_shading.c | |
| parent | 7ca3a1e135f3eb289aab8b1f54278f4864c53e4d (diff) | |
bugfix from Teppo Känsälä, makes moving textures up/down also move their enabled state.
bug: [#9437] Moving texture up/down bug
patch: [#8938] Moving texture up/down to also move 'enabled/disabled'-status of texture
Diffstat (limited to 'source/blender/src/buttons_shading.c')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index aeb14d7c12b..03b73754f46 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -3084,6 +3084,11 @@ void do_matbuts(unsigned short event) break; case B_MTEXMOVEUP: if(ma && (int)ma->texact > 0) { + int mtexuse = ma->septex & (1<<((int)ma->texact)); + ma->septex &= ~(1<<((int)ma->texact)); + ma->septex |= (ma->septex & (1<<((int)ma->texact-1))) << 1; + ma->septex &= ~(1<<((int)ma->texact-1)); + ma->septex |= mtexuse >> 1; mtexswap = ma->mtex[(int)ma->texact]; ma->mtex[(int)ma->texact] = ma->mtex[((int)ma->texact)-1]; ma->mtex[((int)ma->texact)-1] = mtexswap; @@ -3093,6 +3098,11 @@ void do_matbuts(unsigned short event) break; case B_MTEXMOVEDOWN: if(ma && (int)ma->texact < MAX_MTEX-1) { + int mtexuse = ma->septex & (1<<((int)ma->texact)); + ma->septex &= ~(1<<((int)ma->texact)); + ma->septex |= (ma->septex & (1<<((int)ma->texact+1))) >> 1; + ma->septex &= ~(1<<((int)ma->texact+1)); + ma->septex |= mtexuse << 1; mtexswap = ma->mtex[(int)ma->texact]; ma->mtex[(int)ma->texact] = ma->mtex[((int)ma->texact)+1]; ma->mtex[((int)ma->texact)+1] = mtexswap; |