[Bf-blender-cvs] [cc311e4a527] master: IO: print export name instead of object name in debug export graph output

Sybren A. Stüvel noreply at git.blender.org
Tue Jul 7 12:02:58 CEST 2020


Commit: cc311e4a5275e22b9adfec5b2e8cc1b02edf02f7
Author: Sybren A. Stüvel
Date:   Tue Jun 30 15:13:54 2020 +0200
Branches: master
https://developer.blender.org/rBcc311e4a5275e22b9adfec5b2e8cc1b02edf02f7

IO: print export name instead of object name in debug export graph output

This is just a change in `AbstractHierarchyIterator::debug_print_export_graph()`
to aid in debugging. It'll make it possible to distinguish between
different duplicates of the same object.

No functional changes to Blender itself.

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

M	source/blender/io/common/intern/abstract_hierarchy_iterator.cc

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

diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
index dce6b8e178b..1d67792053a 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
@@ -217,7 +217,7 @@ void AbstractHierarchyIterator::debug_print_export_graph(const ExportGraph &grap
     for (HierarchyContext *child_ctx : map_iter.second) {
       if (child_ctx->duplicator == nullptr) {
         printf("       - %s%s%s\n",
-               child_ctx->object->id.name + 2,
+               child_ctx->export_name.c_str(),
                child_ctx->weak_export ? " (weak)" : "",
                child_ctx->original_export_path.empty() ?
                    "" :
@@ -225,7 +225,7 @@ void AbstractHierarchyIterator::debug_print_export_graph(const ExportGraph &grap
       }
       else {
         printf("       - %s (dup by %s%s) %s\n",
-               child_ctx->object->id.name + 2,
+               child_ctx->export_name.c_str(),
                child_ctx->duplicator->id.name + 2,
                child_ctx->weak_export ? ", weak" : "",
                child_ctx->original_export_path.empty() ?
@@ -234,7 +234,7 @@ void AbstractHierarchyIterator::debug_print_export_graph(const ExportGraph &grap
       }
     }
   }
-  printf("    (Total graph size: %zu objects\n", total_graph_size);
+  printf("    (Total graph size: %zu objects)\n", total_graph_size);
 }
 
 void AbstractHierarchyIterator::export_graph_construct()



More information about the Bf-blender-cvs mailing list