Commit: 55a385620e29979ea248230f9aa527432a4095db Author: Hans Goudey Date: Thu Apr 16 17:33:34 2020 -0500 Branches: modifier-panels-ui https://developer.blender.org/rB55a385620e29979ea248230f9aa527432a4095db
Cleanup: Consistent code formatting =================================================================== M source/blender/modifiers/intern/MOD_armature.c M source/blender/modifiers/intern/MOD_decimate.c M source/blender/modifiers/intern/MOD_displace.c M source/blender/modifiers/intern/MOD_hook.c M source/blender/modifiers/intern/MOD_mirror.c M source/blender/modifiers/intern/MOD_normal_edit.c M source/blender/modifiers/intern/MOD_weightvgmix.c =================================================================== diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 64aa1c8efec..a809dfe5c14 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -253,8 +253,8 @@ static void deformMatrices(ModifierData *md, static void panel_draw(const bContext *C, Panel *panel) { uiLayout *sub, *row, *col; - uiLayout *layout = panel->layout; + PointerRNA ptr; PointerRNA ob_ptr; modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 2ac0e73a722..ca7530c8a6a 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -229,8 +229,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes static void panel_draw(const bContext *C, Panel *panel) { uiLayout *sub, *row; - uiLayout *layout = panel->layout; + PointerRNA ptr; PointerRNA ob_ptr; modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index f0d86b7e3ad..12a7a2ca538 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -428,8 +428,8 @@ static void deformVertsEM(ModifierData *md, static void panel_draw(const bContext *C, Panel *panel) { uiLayout *sub, *row, *col; - uiLayout *layout = panel->layout; + PointerRNA ptr; PointerRNA ob_ptr; modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index fee8d284658..56e965ce037 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -446,7 +446,8 @@ static void panel_draw(const bContext *C, Panel *panel) static void falloff_panel_draw(const bContext *C, Panel *panel) { - uiLayout *row, *layout = panel->layout; + uiLayout *row; + uiLayout *layout = panel->layout; PointerRNA ptr; modifier_panel_get_property_pointers(C, panel, NULL, &ptr); diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index b31af81617c..27cf315dbeb 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -139,9 +139,6 @@ static void panel_draw(const bContext *C, Panel *panel) col = uiLayoutColumn(layout, false); uiLayoutSetPropSep(col, true); - /* No decorators for the first few rows. */ - // uiLayoutSetPropDecorate(col, true); - prop = RNA_struct_find_property(&ptr, "use_axis"); row = uiLayoutRowWithHeading(col, true, IFACE_("Axis")); uiItemFullR(row, &ptr, prop, 0, 0, toggles_flag, IFACE_("X"), ICON_NONE); @@ -161,8 +158,6 @@ static void panel_draw(const bContext *C, Panel *panel) uiItemFullR(row, &ptr, prop, 2, 0, toggles_flag, IFACE_("Z"), ICON_NONE); uiItemS(col); - /* Now decorators are fine, we don't insert multiple items in a single row anymore. */ - // uiLayoutSetPropDecorate(col, true); uiItemR(col, &ptr, "mirror_object", 0, NULL, ICON_NONE); diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index bb01e62ec0a..dd351c5e036 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -726,7 +726,7 @@ static void panel_draw(const bContext *C, Panel *panel) static void mix_mode_panel_draw(const bContext *C, Panel *panel) { - /* HANS-TODO: This panel should be open by default. */ + /* This panel could be open by default. */ uiLayout *row, *sub; uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 3ca29bcc01a..c4f529e17e3 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -456,14 +456,6 @@ static void panel_draw(const bContext *C, Panel *panel) uiItemPointerR(layout, &ptr, "vertex_group_b", &ob_ptr, "vertex_groups", NULL, ICON_NONE); uiItemR(layout, &ptr, "default_weight_b", 0, NULL, ICON_NONE); - // col = uiLayoutColumn(split, false); - // sub = uiLayoutColumn(col, false); - // uiItemL(sub, IFACE_("Vertex Group B:"), ICON_NONE); - // uiItemPointerR(sub, &ptr, "vertex_group_b", &ob_ptr, "vertex_groups", "", ICON_NONE); - // sub = uiLayoutColumn(col, false); - // uiItemL(sub, IFACE_("Default Weight B:"), ICON_NONE); - // uiItemR(sub, &ptr, "default_weight_b", 0, "", ICON_NONE); - uiItemS(layout); uiItemR(layout, &ptr, "mix_set", 0, NULL, ICON_NONE); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs