Merge branch 'blender-v3.3-release'

2022-08-09 21:07:50 +10:00
parent 34c7f42c08 7b0bc1573b
commit be50d526eb
1 changed files with 4 additions and 2 deletions
--- a/source/blender/io/collada/EffectExporter.cpp
+++ b/source/blender/io/collada/EffectExporter.cpp
@@ -46,6 +46,7 @@ EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw,

 bool EffectsExporter::hasEffects(Scene *sce)
 {
+  bool result = false;
  FOREACH_SCENE_OBJECT_BEGIN (sce, ob) {
    int a;
    for (a = 0; a < ob->totcol; a++) {
@@ -56,11 +57,12 @@ bool EffectsExporter::hasEffects(Scene *sce)
        continue;
      }

-      return true;
+      result = true;
+      break;
    }
  }
  FOREACH_SCENE_OBJECT_END;
-  return false;
+  return result;
 }

 void EffectsExporter::exportEffects(bContext *C, Scene *sce)