Revision: 21103
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21103
Author: aligorith
Date: 2009-06-23 13:28:48 +0200 (Tue, 23 Jun 2009)
Log Message:
-----------
2.5 - Icons for Modifiers in Modifier Template
As per William's mockup - http://www.reynish.com/files/blender25/modifiers.png
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-06-23 11:16:27 UTC (rev 21102)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-06-23 11:28:48 UTC (rev 21103)
@@ -555,7 +555,10 @@
uiBlockSetEmboss(block, UI_EMBOSSN);
uiDefIconButBitI(block, ICONTOG, eModifierMode_Expanded, 0,
ICON_TRIA_RIGHT, 0, 0, UI_UNIT_X, UI_UNIT_Y, &md->mode, 0.0, 0.0, 0.0, 0.0,
"Collapse/Expand Modifier");
}
-
+
+ /* modifier-type icon */
+ uiDefIconBut(block, BUT, 0, RNA_struct_ui_icon(ptr.type), 0, 0,
UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, "Current Modifier Type");
+
uiBlockSetEmboss(block, UI_EMBOSS);
if (isVirtual) {
@@ -566,7 +569,7 @@
uiButSetFunc(but, modifiers_convertToReal, ob, md);
} else {
uiBlockBeginAlign(block);
- uiDefBut(block, TEX, 0, "", 0, 0, buttonWidth-60, UI_UNIT_Y,
md->name, 0.0, sizeof(md->name)-1, 0.0, 0.0, "Modifier name");
+ uiDefBut(block, TEX, 0, "", 0, 0, buttonWidth-40, UI_UNIT_Y,
md->name, 0.0, sizeof(md->name)-1, 0.0, 0.0, "Modifier name");
/* Softbody not allowed in this situation, enforce! */
if (((md->type!=eModifierType_Softbody &&
md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) &&
(md->type!=eModifierType_Surface)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
