forked from bartvdbraak/blender
lib error message was inconsistent when changing texture channels, enabled it for texture colorbands
This commit is contained in:
parent
1b94e21f9c
commit
4bf152fbcd
@ -1519,6 +1519,7 @@ static void texture_panel_colors(Tex *tex)
|
|||||||
uiNewPanelTabbed("Texture", "Texture");
|
uiNewPanelTabbed("Texture", "Texture");
|
||||||
if(uiNewPanel(curarea, block, "Colors", "Texture", 1280, 0, 318, 204)==0) return;
|
if(uiNewPanel(curarea, block, "Colors", "Texture", 1280, 0, 318, 204)==0) return;
|
||||||
|
|
||||||
|
uiSetButLock(tex->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
|
||||||
|
|
||||||
/* COLORBAND */
|
/* COLORBAND */
|
||||||
uiBlockBeginAlign(block);
|
uiBlockBeginAlign(block);
|
||||||
@ -1588,6 +1589,8 @@ static void texture_panel_texture(MTex *mtex, Material *ma, World *wrld, Lamp *l
|
|||||||
}
|
}
|
||||||
uiBlockSetCol(block, TH_BUT_NEUTRAL);
|
uiBlockSetCol(block, TH_BUT_NEUTRAL);
|
||||||
|
|
||||||
|
uiClearButLock();
|
||||||
|
|
||||||
/* From button: removed */
|
/* From button: removed */
|
||||||
|
|
||||||
/* CHANNELS */
|
/* CHANNELS */
|
||||||
@ -1671,11 +1674,11 @@ static void texture_panel_preview(MTex *mtex, int preview)
|
|||||||
uiDefButC(block, ROW, B_TEXREDR_PRV, "Brush", 200,100,80,25, &G.buts->texfrom, 3.0, 3.0, 0, 0, "Displays the textures of the selected brush");
|
uiDefButC(block, ROW, B_TEXREDR_PRV, "Brush", 200,100,80,25, &G.buts->texfrom, 3.0, 3.0, 0, 0, "Displays the textures of the selected brush");
|
||||||
uiBlockEndAlign(block);
|
uiBlockEndAlign(block);
|
||||||
|
|
||||||
if(mtex && mtex->tex)
|
if(mtex && mtex->tex) {
|
||||||
uiDefButBitS(block, TOG, TEX_PRV_ALPHA, B_TEXREDR_PRV, "Alpha", 200,60,80,20, &mtex->tex->flag, 0, 0, 0, 0, "Show alpha in preview");
|
uiDefButBitS(block, TOG, TEX_PRV_ALPHA, B_TEXREDR_PRV, "Alpha", 200,60,80,20, &mtex->tex->flag, 0, 0, 0, 0, "Show alpha in preview");
|
||||||
|
uiSetButLock(mtex->tex->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
|
||||||
uiDefBut(block, BUT, B_DEFTEXVAR, "Default Vars",200,10,80,20, 0, 0, 0, 0, 0, "Sets all values to defaults");
|
uiDefBut(block, BUT, B_DEFTEXVAR, "Default Vars",200,10,80,20, 0, 0, 0, 0, 0, "Sets all values to defaults");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user