[Bf-blender-cvs] [bdabb02ee67] modifier-panels-ui: Implement panels for more modifiers
Hans Goudey
noreply at git.blender.org
Tue Mar 31 19:11:41 CEST 2020
Commit: bdabb02ee6780898d6bf9fac9956ca32d5ccf2ee
Author: Hans Goudey
Date: Mon Mar 30 19:49:40 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBbdabb02ee6780898d6bf9fac9956ca32d5ccf2ee
Implement panels for more modifiers
UI layouts WIP
===================================================================
M source/blender/editors/interface/interface_templates.c
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluid.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_softbody.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_ui_common.c
===================================================================
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 71b25e7aca4..a9a100f5a01 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1941,6 +1941,8 @@ static PanelType *panel_type_from_modifier_type(ARegion *region, ModifierType ty
void uiTemplateModifiers(uiLayout *UNUSED(layout), bContext *C)
{
+ /* HANS-TODO: Fix crash when panel's modifier type doesn't match. */
+
ScrArea *sa = CTX_wm_area(C);
ARegion *region = CTX_wm_region(C);
Object *ob = CTX_data_active_object(C);
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 46f0dbc0620..10c4840ff2a 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -31,6 +31,7 @@
#include "DNA_armature_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
#include "BKE_action.h"
#include "BKE_context.h"
@@ -40,6 +41,7 @@
#include "BKE_lib_query.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
+#include "BKE_screen.h"
#include "UI_interface.h"
#include "UI_resources.h"
@@ -53,6 +55,7 @@
#include "MEM_guardedalloc.h"
+#include "MOD_ui_common.h"
#include "MOD_util.h"
static void initData(ModifierData *md)
@@ -247,33 +250,48 @@ static void deformMatrices(ModifierData *md,
}
}
-// uiLayout *sub, *row, *col, *split;
+static void panel_draw(const bContext *C, Panel *panel)
+{
+ uiLayout *sub, *row, *col, *split;
+
+ uiLayout *layout = panel->layout;
+ PointerRNA ptr;
+ PointerRNA ob_ptr;
+ modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
-// bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0;
+ bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0;
-// split = uiLayoutSplit(layout, 0.5f, false);
+ split = uiLayoutSplit(layout, 0.5f, false);
-// col = uiLayoutColumn(split, false);
-// uiItemL(col, IFACE_("Object:"), ICON_NONE);
-// uiItemR(col, ptr, "object", 0, "", ICON_NONE);
-// uiItemR(col, ptr, "use_deform_preserve_volume", 0, NULL, ICON_NONE);
+ col = uiLayoutColumn(split, false);
+ uiItemL(col, IFACE_("Object:"), ICON_NONE);
+ uiItemR(col, &ptr, "object", 0, "", ICON_NONE);
+ uiItemR(col, &ptr, "use_deform_preserve_volume", 0, NULL, ICON_NONE);
-// col = uiLayoutColumn(split, false);
-// uiItemL(col, IFACE_("Bind to:"), ICON_NONE);
-// uiItemR(col, ptr, "use_vertex_groups", 0, IFACE_("Vertex Groups"), ICON_NONE);
-// uiItemR(col, ptr, "use_bone_envelopes", 0, IFACE_("Bone Envelopes"), ICON_NONE);
+ col = uiLayoutColumn(split, false);
+ uiItemL(col, IFACE_("Bind to:"), ICON_NONE);
+ uiItemR(col, &ptr, "use_vertex_groups", 0, IFACE_("Vertex Groups"), ICON_NONE);
+ uiItemR(col, &ptr, "use_bone_envelopes", 0, IFACE_("Bone Envelopes"), ICON_NONE);
-// uiItemS(layout);
+ uiItemS(layout);
-// split = uiLayoutSplit(layout, 0.5f, false);
+ split = uiLayoutSplit(layout, 0.5f, false);
-// row = uiLayoutRow(split, true);
-// uiItemPointerR(row, ptr, "vertex_group", ob_ptr, "vertex_groups", "", ICON_NONE);
-// sub = uiLayoutRow(row, true);
-// uiLayoutSetActive(sub, has_vertex_group);
-// uiItemR(sub, ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
+ row = uiLayoutRow(split, true);
+ uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", "", ICON_NONE);
+ sub = uiLayoutRow(row, true);
+ uiLayoutSetActive(sub, has_vertex_group);
+ uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
-// uiItemR(split, ptr, "use_multi_modifier", 0, NULL, ICON_NONE);
+ uiItemR(split, &ptr, "use_multi_modifier", 0, NULL, ICON_NONE);
+
+ modifier_panel_end(layout, &ptr);
+}
+
+static void panelRegister(ARegionType *region_type)
+{
+ modifier_panel_register(region_type, "Armature", panel_draw);
+}
ModifierTypeInfo modifierType_Armature = {
/* name */ "Armature",
@@ -302,4 +320,5 @@ ModifierTypeInfo modifierType_Armature = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
+ /* panelRegister */ panelRegister,
};
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index c22f9d52d15..9ee175a5a21 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -32,6 +32,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
#include "DEG_depsgraph_query.h"
@@ -40,6 +41,7 @@
#include "BKE_modifier.h"
#include "BKE_particle.h"
#include "BKE_scene.h"
+#include "BKE_screen.h"
#include "UI_interface.h"
#include "UI_resources.h"
@@ -47,6 +49,7 @@
#include "RNA_access.h"
#include "MOD_modifiertypes.h"
+#include "MOD_ui_common.h"
static void initData(ModifierData *md)
{
@@ -281,20 +284,34 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, str
return result;
}
-// uiLayout *col, *split, *sub;
+static void panel_draw(const bContext *C, Panel *panel)
+{
+ uiLayout *col, *split, *sub;
+
+ uiLayout *layout = panel->layout;
+ PointerRNA ptr;
+ modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
-// split = uiLayoutSplit(layout, 0.5f, false);
+ split = uiLayoutSplit(layout, 0.5f, false);
-// col = uiLayoutColumn(split, false);
-// uiItemR(col, ptr, "frame_start", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "frame_duration", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "use_reverse", 0, NULL, ICON_NONE);
+ col = uiLayoutColumn(split, false);
+ uiItemR(col, &ptr, "frame_start", 0, NULL, ICON_NONE);
+ uiItemR(col, &ptr, "frame_duration", 0, NULL, ICON_NONE);
+ uiItemR(col, &ptr, "use_reverse", 0, NULL, ICON_NONE);
-// col = uiLayoutColumn(split, false);
-// uiItemR(col, ptr, "use_random_order", 0, NULL, ICON_NONE);
-// sub = uiLayoutColumn(col, true);
-// uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_random_order"));
-// uiItemR(sub, ptr, "seed", 0, "", ICON_ARROW_LEFTRIGHT);
+ col = uiLayoutColumn(split, false);
+ uiItemR(col, &ptr, "use_random_order", 0, NULL, ICON_NONE);
+ sub = uiLayoutColumn(col, true);
+ uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_random_order"));
+ uiItemR(sub, &ptr, "seed", 0, "", ICON_ARROW_LEFTRIGHT);
+
+ modifier_panel_end(layout, &ptr);
+}
+
+static void panelRegister(ARegionType *region_type)
+{
+ modifier_panel_register(region_type, "Build", panel_draw);
+}
ModifierTypeInfo modifierType_Build = {
/* name */ "Build",
@@ -322,5 +339,5 @@ ModifierTypeInfo modifierType_Build = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panelRegister */ NULL,
+ /* panelRegister */ panelRegister,
};
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index d9df53d20f2..18f7447bffa 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -30,6 +30,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
#include "BKE_context.h"
#include "BKE_deform.h"
@@ -38,6 +39,7 @@
#include "BKE_lib_query.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
+#include "BKE_screen.h"
#include "UI_interface.h"
#include "UI_resources.h"
@@ -46,6 +48,7 @@
#include "DEG_depsgraph_query.h"
+#include "MOD_ui_common.h"
#include "MOD_util.h"
static void initData(ModifierData *md)
@@ -526,43 +529,53 @@ static void deformVertsEM(ModifierData *md,
}
}
-// uiLayout *sub, *row, *col, *split;
-
-// bool has_vertex_group = RNA_string_length(ptr, "vertex_group") != 0;
-// PointerRNA cast_object_ptr = RNA_pointer_get(ptr, "object");
-
-// split = uiLayoutSplit(layout, 0.25f, false);
-// uiItemL(split, IFACE_("Cast Type:"), ICON_NONE);
-// uiItemR(split, ptr, "cast_type", 0, "", ICON_NONE);
-
-// split = uiLayoutSplit(layout, 0.25f, false);
-
-// col = uiLayoutColumn(split, false);
-// uiItemR(col, ptr, "use_x", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "use_y", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "use_z", 0, NULL, ICON_NONE);
-
-// col = uiLayoutColumn(split, false);
-// uiItemR(col, ptr, "factor", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "radius", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "size", 0, NULL, ICON_NONE);
-// uiItemR(col, ptr, "use_radius_as_size", 0, NULL, ICON_NONE);
+static void panel_draw(const bContext *C, Panel *panel)
+{
+ uiLayout *sub, *row, *col, *split;
+
+ uiLayout *layout = panel->layout;
+ PointerRNA ptr;
+ PointerRNA ob_ptr;
+ modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
+
+ bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0;
+ PointerRNA cast_object_ptr = RNA_pointer_get(&ptr, "object");
+
+ uiItemR(layout, &ptr, "cast_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+
+ row = uiLayoutRow(layout, false);
+ uiItemR(row, &ptr, "use_x", 0, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_y", 0, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_z", 0, NULL, ICON_NONE);
+
+ uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE);
+ uiItemR(layout, &ptr, "radius", 0, NULL, ICON_NONE);
+ uiItemR(layout, &ptr, "size", 0, NULL, ICON_NONE);
+ uiItemR(layout, &ptr, "use_radius_as_size", 0, NULL, ICON_NONE);
+
+ split = uiLayoutSplit(layout, 0.5f, false);
+ col = uiLayoutColumn(split, false);
+ uiItemL(col, IFACE_("Vertex Group:"), ICON_NONE);
+ row = uiLayoutRow(col, true);
+ uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", "", ICON_NONE);
+ sub = uiLayoutRow(row, true);
+ uiLayoutSetActive(sub, has_vertex_group);
+ uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
+
+ col = uiLayoutColumn(split, false);
+ uiItemL(col, IFACE_("Control Object:"), ICON_NONE);
+ uiItemR(col, &ptr, "object", 0, "", ICON_NONE);
+ if (!RNA_pointer_is_null(&cast_object_ptr)) {
+ uiItemR(col, &ptr, "use_radius_as_size", 0, NULL, ICON_NONE);
+ }
-// split = uiLayoutSplit(layout, 0.5f, false);
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list