[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14134] trunk/blender/source/blender/src: Bugfix #8526
Ton Roosendaal
ton at blender.org
Sun Mar 16 12:09:36 CET 2008
Revision: 14134
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14134
Author: ton
Date: 2008-03-16 12:09:34 +0100 (Sun, 16 Mar 2008)
Log Message:
-----------
Bugfix #8526
Sometimes a panel could not be moved, this caused by fact that its
parent was sometimes not visible. Old bug actually. :)
There's a lot of editbutton panels btw... so there it happened.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/interface_panel.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2008-03-16 10:26:13 UTC (rev 14133)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-03-16 11:09:34 UTC (rev 14134)
@@ -6195,6 +6195,9 @@
uiDefButC(block, ROW, REDRAWVIEW3D, "Add", 660,80,60,19, &tf->transp, 2.0, (float)TF_ADD, 0, 0, "Render face transparent and add color of face");
uiDefButC(block, ROW, REDRAWVIEW3D, "Alpha", 720,80,60,19, &tf->transp, 2.0, (float)TF_ALPHA,0, 0, "Render polygon transparent, depending on alpha channel of the texture");
}
+ else
+ uiDefBut(block,LABEL,B_NOP, "(No Active Face)", 10,200,150,19,0,0,0,0,0,"");
+
}
void do_uvcalculationbuts(unsigned short event)
Modified: trunk/blender/source/blender/src/interface_panel.c
===================================================================
--- trunk/blender/source/blender/src/interface_panel.c 2008-03-16 10:26:13 UTC (rev 14133)
+++ trunk/blender/source/blender/src/interface_panel.c 2008-03-16 11:09:34 UTC (rev 14134)
@@ -606,7 +606,9 @@
if(panel==NULL) return 0;
while(pa) {
- if(pa->paneltab==panel) return 1;
+ if(pa->active && pa->paneltab==panel) {
+ return 1;
+ }
pa= pa->next;
}
return 0;
More information about the Bf-blender-cvs
mailing list