blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Bastien Montagne 2021-11-22 09:32:59 +01:00
parent fb470c256a 6c16bb2706
commit db20837c3a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2036,6 +2036,15 @@ static void constraint_reorder(bContext *C, Panel *panel, int new_index)
PointerRNA *con_ptr = UI_panel_custom_data_get(panel);
bConstraint *con = (bConstraint *)con_ptr->data;
/* Ensure called operator does have a context with the expected "constraint" member. */
ListBase contexts = {NULL};
bContextStore *previous_context_store = CTX_store_get(C);
if (previous_context_store != NULL) {
BLI_addtail(&contexts, previous_context_store);
}
bContextStore *constraint_context_store = CTX_store_add(&contexts, "constraint", con_ptr);
CTX_store_set(C, constraint_context_store);
PointerRNA props_ptr;
wmOperatorType *ot = WM_operatortype_find("CONSTRAINT_OT_move_to_index", false);
WM_operator_properties_create_ptr(&props_ptr, ot);
@ -2045,6 +2054,12 @@ static void constraint_reorder(bContext *C, Panel *panel, int new_index)
RNA_enum_set(&props_ptr, "owner", constraint_from_bone ? 1 : 0);
WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr);
WM_operator_properties_free(&props_ptr);
/* Cleanup modified context. */
CTX_store_set(C, previous_context_store);
if (previous_context_store != constraint_context_store) {
CTX_store_free(constraint_context_store);
}
}
/**

4
source/blender/makesrna/intern/rna_nla.c
View File

@ -885,6 +885,8 @@ static void rna_def_nlatrack(BlenderRNA *brna)
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_ui_text(prop, "NLA Strips", "NLA Strips on this NLA-track");
rna_api_nlatrack_strips(brna, prop);
prop = RNA_def_boolean(srna,
"is_override_data",
false,
@ -894,8 +896,6 @@ static void rna_def_nlatrack(BlenderRNA *brna)
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", NLATRACK_OVERRIDELIBRARY_LOCAL);
rna_api_nlatrack_strips(brna, prop);
RNA_define_lib_overridable(true);
/* name property */