[Bf-blender-cvs] [38a8d3aff1a] master: Merge branch 'blender-v2.83-release'
Bastien Montagne
noreply at git.blender.org
Mon May 18 17:57:04 CEST 2020
Commit: 38a8d3aff1a8362530497299da351683a330ab59
Author: Bastien Montagne
Date: Mon May 18 17:56:57 2020 +0200
Branches: master
https://developer.blender.org/rB38a8d3aff1a8362530497299da351683a330ab59
Merge branch 'blender-v2.83-release'
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_edit.c
index b3c36f688d0,27422e5b42a..3db75d9288b
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@@ -460,13 -450,12 +460,16 @@@ void OUTLINER_OT_item_rename(wmOperator
ot->invoke = outliner_item_rename;
ot->poll = ED_operator_outliner_active;
+
+ /* Flags. */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-/* ID delete --------------------------------------------------- */
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name ID Delete Operator
+ * \{ */
static void id_delete(bContext *C, ReportList *reports, TreeElement *te, TreeStoreElem *tselem)
{
@@@ -578,13 -567,12 +581,16 @@@ void OUTLINER_OT_id_delete(wmOperatorTy
ot->invoke = outliner_id_delete_invoke;
ot->poll = ED_operator_outliner_active;
+
+ /* Flags. */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-/* ID remap --------------------------------------------------- */
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name ID Remap Operator
+ * \{ */
static int outliner_id_remap_exec(bContext *C, wmOperator *op)
{
More information about the Bf-blender-cvs
mailing list