nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +7 -5
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6478eb565a - Show all commits

2
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -3478,7 +3478,7 @@ def km_animation_channels(params):
# Selection. # Selection.
*_template_items_select_actions(params, "anim.channels_select_all"), *_template_items_select_actions(params, "anim.channels_select_all"),
("anim.channels_select_box", {"type": 'B', "value": 'PRESS'}, None), ("anim.channels_select_box", {"type": 'B', "value": 'PRESS'}, None),
("anim.channels_select_box", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG'}, ("anim.channels_select_box", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG'},
{"properties": [("extend", False)]}), {"properties": [("extend", False)]}),
("anim.channels_select_box", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG', "shift": True}, ("anim.channels_select_box", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG', "shift": True},
{"properties": [("extend", True)]}), {"properties": [("extend", True)]}),

4
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -2329,8 +2329,8 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel):
({"property": "use_override_templates"}, ({"property": "use_override_templates"},
("blender/blender/issues/73318", ("blender/blender/issues/73318",
"Milestone 4")), "Milestone 4")),
({"property": "use_new_volume_nodes"}, ({"property": "use_new_volume_nodes"},
("blender/blender/issues/103248", ("blender/blender/issues/103248",
"#103248")), "#103248")),
), ),
) )

3
source/blender/editors/space_view3d/view3d_select.cc
View File

@ -3568,7 +3568,8 @@ static bool do_mesh_box_select(ViewContext *vc,
} }
if (ts->selectmode & SCE_SELECT_EDGE) { if (ts->selectmode & SCE_SELECT_EDGE) {
/* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */ /* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */
struct BoxSelectUserData_ForMeshEdge cb_data {}; struct BoxSelectUserData_ForMeshEdge cb_data {
};
cb_data.data = &data; cb_data.data = &data;
cb_data.esel = use_zbuf ? esel : nullptr; cb_data.esel = use_zbuf ? esel : nullptr;
cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem( cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem(

3
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -10782,7 +10782,8 @@ static void def_geo_string_to_curves(StructRNA *srna)
RNA_def_property_enum_sdna(prop, NULL, "overflow"); RNA_def_property_enum_sdna(prop, NULL, "overflow");
RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_overflow_items); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_overflow_items);
RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW);
RNA_def_property_ui_text(prop, "Textbox Overflow", "Handle the text behavior when it doesn't fit in the text boxes"); RNA_def_property_ui_text(
prop, "Textbox Overflow", "Handle the text behavior when it doesn't fit in the text boxes");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
prop = RNA_def_property(srna, "align_x", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "align_x", PROP_ENUM, PROP_NONE);