[Bf-blender-cvs] [31279d522be] master: Fix: Compiler warning in macro after recent C++ conversion

Hans Goudey noreply at git.blender.org
Wed Aug 17 19:16:56 CEST 2022


Commit: 31279d522be289c5dbb68e26673eb588cee76252
Author: Hans Goudey
Date:   Wed Aug 17 13:16:48 2022 -0400
Branches: master
https://developer.blender.org/rB31279d522be289c5dbb68e26673eb588cee76252

Fix: Compiler warning in macro after recent C++ conversion

The iterator parameters struct should be initialized to zero in both
C and C++. Using memset seems to be the only reliable way to do that.

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

M	source/blender/blenkernel/BKE_layer.h

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

diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index c42dd246030..3d064c7dea7 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -354,7 +354,8 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
 
 #define FOREACH_BASE_IN_MODE_BEGIN(_view_layer, _v3d, _object_type, _object_mode, _instance) \
   { \
-    struct ObjectsInModeIteratorData data_ = {NULL}; \
+    struct ObjectsInModeIteratorData data_; \
+    memset(&data_, 0, sizeof(data_)); \
     data_.object_mode = _object_mode; \
     data_.object_type = _object_type; \
     data_.view_layer = _view_layer; \



More information about the Bf-blender-cvs mailing list