dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Hans Goudey
2024-03-12 17:34:52 -04:00
parent 6cbdb9c242 6b81fbced8
commit 77b6f5d7e3
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/startup/bl_ui/space_view3d.py
+5 -1
View File
@@ -972,7 +972,11 @@ class VIEW3D_HT_header(Header):
row = layout.row()
row.popover(panel="VIEW3D_PT_slots_projectpaint", icon=icon)
row.popover(panel="VIEW3D_PT_mask", icon=VIEW3D_HT_header._texture_mask_icon(tool_settings.image_paint), text="")
row.popover(
panel="VIEW3D_PT_mask",
icon=VIEW3D_HT_header._texture_mask_icon(
tool_settings.image_paint),
text="")
else:
# Transform settings depending on tool header visibility
VIEW3D_HT_header.draw_xform_template(layout, context)
source/blender/blenkernel/intern/mesh_legacy_convert.cc
+3 -5
View File
@@ -2246,16 +2246,14 @@ static ModifierData *create_auto_smooth_modifier(Object &object,
md->node_group = get_node_group();
md->settings.properties = idprop::create_group("Nodes Modifier Settings").release();
IDProperty *angle_prop = idprop::create(DATA_("Socket_1"), angle).release();
IDProperty *angle_prop = idprop::create("Socket_1", angle).release();
auto *ui_data = reinterpret_cast<IDPropertyUIDataFloat *>(IDP_ui_data_ensure(angle_prop));
ui_data->base.rna_subtype = PROP_ANGLE;
ui_data->soft_min = 0.0f;
ui_data->soft_max = DEG2RADF(180.0f);
IDP_AddToGroup(md->settings.properties, angle_prop);
IDP_AddToGroup(md->settings.properties,
idprop::create(DATA_("Input_1_use_attribute"), 0).release());
IDP_AddToGroup(md->settings.properties,
idprop::create(DATA_("Input_1_attribute_name"), "").release());
IDP_AddToGroup(md->settings.properties, idprop::create("Socket_1_use_attribute", 0).release());
IDP_AddToGroup(md->settings.properties, idprop::create("Socket_1_attribute_name", "").release());
BKE_modifiers_persistent_uid_init(object, md->modifier);
return &md->modifier;