Revision: 14239
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14239
Author: campbellbarton
Date: 2008-03-25 20:27:49 +0100 (Tue, 25 Mar 2008)
Log Message:
-----------
lib error message was inconsistent when changing texture channels, enabled it
for texture colorbands
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-03-25 16:16:11 UTC
(rev 14238)
+++ trunk/blender/source/blender/src/buttons_shading.c 2008-03-25 19:27:49 UTC
(rev 14239)
@@ -1519,6 +1519,7 @@
uiNewPanelTabbed("Texture", "Texture");
if(uiNewPanel(curarea, block, "Colors", "Texture", 1280, 0, 318,
204)==0) return;
+ uiSetButLock(tex->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
/* COLORBAND */
uiBlockBeginAlign(block);
@@ -1588,8 +1589,10 @@
}
uiBlockSetCol(block, TH_BUT_NEUTRAL);
+ uiClearButLock();
+
/* From button: removed */
-
+
/* CHANNELS */
if(node==NULL) {
uiBlockBeginAlign(block);
@@ -1671,11 +1674,11 @@
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);
- 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");
-
- uiDefBut(block, BUT, B_DEFTEXVAR, "Default Vars",200,10,80,20, 0, 0, 0,
0, 0, "Sets all values to defaults");
-
+ 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");
+ 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");
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
