[Bf-blender-cvs] [0b246ed8131] blender-v3.0-release: Revert "Fix (unreported) broken handling of constraints reordering with liboverride."

Bastien Montagne noreply at git.blender.org
Mon Nov 22 10:39:41 CET 2021


Commit: 0b246ed8131f19235230b713812db6260fcbbb74
Author: Bastien Montagne
Date:   Mon Nov 22 10:39:20 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB0b246ed8131f19235230b713812db6260fcbbb74

Revert "Fix (unreported) broken handling of constraints reordering with liboverride."

This reverts commit 6eaa69c66c98d291b80331330391664415f759a4.

Committed by nistake, sorry for the noise.

===================================================================

M	source/blender/editors/interface/interface_templates.c

===================================================================

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index ac638395c0b..1d349aa0596 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2036,15 +2036,6 @@ 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);
@@ -2054,12 +2045,6 @@ 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);
-  }
 }
 
 /**



More information about the Bf-blender-cvs mailing list