[Bf-blender-cvs] [ee734dcc73f] master: Fix T69754: crash in sculpting after library overrides were enabled

Brecht Van Lommel noreply at git.blender.org
Wed Sep 11 17:33:23 CEST 2019


Commit: ee734dcc73f5d19aa74756228a6b58f7aa9fe16a
Author: Brecht Van Lommel
Date:   Wed Sep 11 17:31:00 2019 +0200
Branches: master
https://developer.blender.org/rBee734dcc73f5d19aa74756228a6b58f7aa9fe16a

Fix T69754: crash in sculpting after library overrides were enabled

The rest of this function uses G_MAIN, so do the same.

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

M	source/blender/blenkernel/intern/undo_system.c

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

diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c
index 36b950fb8f9..ecae1650a51 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -503,7 +503,7 @@ bool BKE_undosys_step_push_with_type(UndoStack *ustack,
   /* Might not be final place for this to be called - probably only want to call it from some
    * undo handlers, not all of them? */
   if (BKE_override_library_is_enabled()) {
-    BKE_main_override_library_operations_create(CTX_data_main(C), false);
+    BKE_main_override_library_operations_create(G_MAIN, false);
   }
 
   /* Remove all undos after (also when 'ustack->step_active == NULL'). */



More information about the Bf-blender-cvs mailing list