kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Tiny tweaks to modifier template. Added more logical icons for enabling modifiers in edit mode etc.

Browse Source
This commit is contained in:
William Reynish 2009-07-31 10:21:29 +00:00
parent 65cb64665a
commit b7d11a5eef
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/interface/interface_templates.c
View File

@ -432,31 +432,21 @@ static uiLayout *draw_modifier(uiLayout *layout, Object *ob, ModifierData *md, i
/* Softbody not allowed in this situation, enforce! */ /* 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)) { if(((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) && (md->type!=eModifierType_Surface)) {
uiItemR(row, "", ICON_SCENE, &ptr, "render", 0, 0, 0); uiItemR(row, "", ICON_SCENE, &ptr, "render", 0, 0, 0);
uiItemR(row, "", ICON_VIEW3D, &ptr, "realtime", 0, 0, 0); uiItemR(row, "", ICON_RESTRICT_VIEW_OFF, &ptr, "realtime", 0, 0, 0);
if(mti->flags & eModifierTypeFlag_SupportsEditmode) if(mti->flags & eModifierTypeFlag_SupportsEditmode)
uiItemR(row, "", ICON_VIEW3D, &ptr, "editmode", 0, 0, 0); uiItemR(row, "", ICON_EDITMODE_HLT, &ptr, "editmode", 0, 0, 0);
} }
uiBlockEndAlign(block);
/* XXX uiBlockSetEmboss(block, UI_EMBOSSR); */ /* XXX uiBlockSetEmboss(block, UI_EMBOSSR); */
if(ob->type==OB_MESH && modifier_couldBeCage(md) && index<=lastCageIndex) { if(ob->type==OB_MESH && modifier_couldBeCage(md) && index<=lastCageIndex) {
int icon; //, color;
if(index==cageIndex) {
// XXX color = TH_BUT_SETTING;
icon = VICON_EDITMODE_HLT;
} else if(index<cageIndex) {
// XXX color = TH_BUT_NEUTRAL;
icon = VICON_EDITMODE_DEHLT;
} else {
// XXX color = TH_BUT_NEUTRAL;
icon = ICON_BLANK1;
}
/* XXX uiBlockSetCol(block, color); */ /* XXX uiBlockSetCol(block, color); */
but = uiDefIconBut(block, BUT, 0, icon, 0, 0, 16, 16, NULL, 0.0, 0.0, 0.0, 0.0, "Apply modifier to editing cage during Editmode"); but = uiDefIconBut(block, BUT, 0, ICON_MESH_DATA, 0, 0, 16, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Apply modifier to editing cage during Editmode");
uiButSetFunc(but, modifiers_setOnCage, ob, md); uiButSetFunc(but, modifiers_setOnCage, ob, md);
uiBlockEndAlign(block);
/* XXX uiBlockSetCol(block, TH_AUTO); */ /* XXX uiBlockSetCol(block, TH_AUTO); */
} }
} }
@ -464,8 +454,10 @@ static uiLayout *draw_modifier(uiLayout *layout, Object *ob, ModifierData *md, i
/* up/down/delete */ /* up/down/delete */
if(!isVirtual) { if(!isVirtual) {
/* XXX uiBlockSetCol(block, TH_BUT_ACTION); */ /* XXX uiBlockSetCol(block, TH_BUT_ACTION); */
uiBlockBeginAlign(block);
uiItemO(row, "", VICON_MOVE_UP, "OBJECT_OT_modifier_move_up"); uiItemO(row, "", VICON_MOVE_UP, "OBJECT_OT_modifier_move_up");
uiItemO(row, "", VICON_MOVE_DOWN, "OBJECT_OT_modifier_move_down"); uiItemO(row, "", VICON_MOVE_DOWN, "OBJECT_OT_modifier_move_down");
uiBlockEndAlign(block);
uiBlockSetEmboss(block, UI_EMBOSSN); uiBlockSetEmboss(block, UI_EMBOSSN);