[Bf-blender-cvs] [ce9b0468fd3] temp-sybren-usd-patch-02: USD: use LISTBASE_FOREACH

Sybren A. Stüvel noreply at git.blender.org
Wed Dec 11 16:37:14 CET 2019


Commit: ce9b0468fd3b9e2098453ff981b3c09f71e6503e
Author: Sybren A. Stüvel
Date:   Wed Dec 11 16:07:07 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rBce9b0468fd3b9e2098453ff981b3c09f71e6503e

USD: use LISTBASE_FOREACH

No functional changes.

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

M	source/blender/usd/intern/abstract_hierarchy_iterator.cc

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

diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
index 0f1ec054df1..3ad2b2ce5d8 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -28,6 +28,7 @@ extern "C" {
 #include "BKE_particle.h"
 
 #include "BLI_assert.h"
+#include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 
 #include "DNA_ID.h"
@@ -193,18 +194,14 @@ void AbstractHierarchyIterator::export_graph_construct()
       // Construct the set of duplicated objects, so that later we can determine whether a parent
       // is also duplicated itself.
       std::set<Object *> dupli_set;
-      for (DupliObject *dupli_object = static_cast<DupliObject *>(lb->first);
-           dupli_object != nullptr;
-           dupli_object = dupli_object->next) {
+      LISTBASE_FOREACH (DupliObject *, dupli_object, lb) {
         if (!should_visit_dupli_object(dupli_object)) {
           continue;
         }
         dupli_set.insert(dupli_object->ob);
       }
 
-      for (DupliObject *dupli_object = static_cast<DupliObject *>(lb->first);
-           dupli_object != nullptr;
-           dupli_object = dupli_object->next) {
+      LISTBASE_FOREACH (DupliObject *, dupli_object, lb) {
         if (!should_visit_dupli_object(dupli_object)) {
           continue;
         }



More information about the Bf-blender-cvs mailing list