[Bf-blender-cvs] [a2401c0ef91] usd-importer-T81257: USD importer undo bug workaround.

makowalski noreply at git.blender.org
Sun Dec 27 22:18:14 CET 2020


Commit: a2401c0ef9127dda3eaf57910fa403c342eae6a9
Author: makowalski
Date:   Wed Dec 23 20:33:42 2020 -0500
Branches: usd-importer-T81257
https://developer.blender.org/rBa2401c0ef9127dda3eaf57910fa403c342eae6a9

USD importer undo bug workaround.

Skipping call to ED_undo_push() at end of the import,
as invoking this function appears to cause occasional
crashes.  This logic should be restored once the
source of the crash is determined.

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

M	source/blender/io/usd/intern/usd_capi.cc

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

diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index 4916b071868..7001e7d26ac 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -447,11 +447,11 @@ static void import_endjob(void *user_data)
     DEG_id_tag_update(&data->scene->id, ID_RECALC_BASE_FLAGS);
     DEG_relations_tag_update(data->bmain);
 
-    if (data->is_background_job) {
-      /* Blender already returned from the import operator, so we need to store our own extra undo
-       * step. */
-      ED_undo_push(data->C, "USD Import Finished");
-    }
+    //if (data->is_background_job) {
+    //  /* Blender already returned from the import operator, so we need to store our own extra undo
+    //   * step. */
+    //  ED_undo_push(data->C, "USD Import Finished");
+    //}
   }
 
   /* Delete the reders. */



More information about the Bf-blender-cvs mailing list