From 10a396d4b73f447457602e1b80d7725ef0cc89f5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 18 Apr 2008 22:13:22 +0000 Subject: =?UTF-8?q?bugfix=20from=20Teppo=20K=C3=A4ns=C3=A4l=C3=A4,=20makes?= =?UTF-8?q?=20moving=20textures=20up/down=20also=20move=20their=20enabled?= =?UTF-8?q?=20state.=20bug:=20[#9437]=20Moving=20texture=20up/down=20bug?= =?UTF-8?q?=20patch:=20[#8938]=20Moving=20texture=20up/down=20to=20also=20?= =?UTF-8?q?move=20'enabled/disabled'-status=20of=20texture?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/blender/src/buttons_shading.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source/blender/src/buttons_shading.c') 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; -- cgit v1.2.3