diff options
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
-rw-r--r-- | source/blender/editors/render/render_shading.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 4a2c88f54a7..a9023194271 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -697,6 +697,16 @@ static int texture_slot_move(bContext *C, wmOperator *op) mtexswap = mtex_ar[act]; mtex_ar[act] = mtex_ar[act-1]; mtex_ar[act-1] = mtexswap; + + if(GS(id->name)==ID_MA) { + Material *ma= (Material *)id; + int mtexuse = ma->septex & (1<<act); + ma->septex &= ~(1<<act); + ma->septex |= (ma->septex & (1<<(act-1))) << 1; + ma->septex &= ~(1<<(act-1)); + ma->septex |= mtexuse >> 1; + } + set_active_mtex(id, act-1); } } @@ -705,6 +715,16 @@ static int texture_slot_move(bContext *C, wmOperator *op) mtexswap = mtex_ar[act]; mtex_ar[act] = mtex_ar[act+1]; mtex_ar[act+1] = mtexswap; + + if(GS(id->name)==ID_MA) { + Material *ma= (Material *)id; + int mtexuse = ma->septex & (1<<act); + ma->septex &= ~(1<<act); + ma->septex |= (ma->septex & (1<<(act+1))) >> 1; + ma->septex &= ~(1<<(act+1)); + ma->septex |= mtexuse << 1; + } + set_active_mtex(id, act+1); } } |