[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14469] trunk/blender/source/blender/src/ buttons_shading.c: bugfix from Teppo K?\195?\164ns?\195?\164l?\195?\164, makes moving textures up/down also move their enabled state.

[Campbell Barton]

Revision: 14469
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14469
Author:   campbellbarton
Date:     2008-04-19 00:13:22 +0200 (Sat, 19 Apr 2008)

Log Message:
-----------
bugfix from Teppo K?\195?\164ns?\195?\164l?\195?\164, 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

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_shading.c

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c  2008-04-18 21:59:54 UTC 
(rev 14468)
+++ trunk/blender/source/blender/src/buttons_shading.c  2008-04-18 22:13:22 UTC 
(rev 14469)
@@ -3084,6 +3084,11 @@
                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 @@
                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;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs