[Bf-blender-cvs] [48a5b1664a5] master: Merge branch 'blender-v2.83-release'
Bastien Montagne
noreply at git.blender.org
Mon May 18 15:54:42 CEST 2020
Commit: 48a5b1664a58c93719b7059bc766e97379a14db9
Author: Bastien Montagne
Date: Mon May 18 15:54:30 2020 +0200
Branches: master
https://developer.blender.org/rB48a5b1664a58c93719b7059bc766e97379a14db9
Merge branch 'blender-v2.83-release'
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_edit.c
index 97ce9ad549f,26d356a290d..b3c36f688d0
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@@ -863,14 -835,11 +863,15 @@@ void OUTLINER_OT_id_paste(wmOperatorTyp
ot->exec = outliner_id_paste_exec;
ot->poll = ED_operator_outliner_active;
- ot->flag = 0;
+ /* flags */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-/* Library relocate/reload --------------------------------------------------- */
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Library Relocate Operator
+ * \{ */
static int lib_relocate(
bContext *C, TreeElement *te, TreeStoreElem *tselem, wmOperatorType *ot, const bool reload)
More information about the Bf-blender-cvs
mailing list