diff options
| author | Campbell Barton <campbell@blender.org> | 2022-03-24 09:30:45 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-03-24 09:30:45 +0300 |
| commit | e006e6608437c16102774879824bc9644acb3521 (patch) | |
| tree | e6bfa483d0399dce2115fbca67f75c1b8806fe9e | |
| parent | 4682a0882f02c50b20aa3c4bf9abe9f7ec2e834b (diff) | |
Cleanup: use struct member identifiers for initialization
Relying on the order of struct members can be error prone. Update other
instances of ObjectsVisibleIteratorData initialization for MSVC/C++.
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 7f099125706..712718a30e0 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -301,10 +301,9 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_SELECTED_OBJECT_BEGIN(_view_layer, _v3d, _instance) \ { \ - struct ObjectsVisibleIteratorData data_ = { \ - .view_layer = _view_layer, \ - .v3d = _v3d, \ - }; \ + struct ObjectsVisibleIteratorData data_ = {}; \ + data_.view_layer = _view_layer; \ + data_.v3d = _v3d; \ ITER_BEGIN (BKE_view_layer_selected_objects_iterator_begin, \ BKE_view_layer_selected_objects_iterator_next, \ BKE_view_layer_selected_objects_iterator_end, \ @@ -319,7 +318,9 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN(_view_layer, _v3d, _instance) \ { \ - struct ObjectsVisibleIteratorData data_ = {_view_layer, _v3d}; \ + struct ObjectsVisibleIteratorData data_ = {}; \ + data_.view_layer = _view_layer; \ + data_.v3d = _v3d; \ ITER_BEGIN (BKE_view_layer_selected_editable_objects_iterator_begin, \ BKE_view_layer_selected_editable_objects_iterator_next, \ BKE_view_layer_selected_editable_objects_iterator_end, \ @@ -334,10 +335,9 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_VISIBLE_OBJECT_BEGIN(_view_layer, _v3d, _instance) \ { \ - struct ObjectsVisibleIteratorData data_ = { \ - .view_layer = _view_layer, \ - .v3d = _v3d, \ - }; \ + struct ObjectsVisibleIteratorData data_ = {}; \ + data_.view_layer = _view_layer; \ + data_.v3d = _v3d; \ ITER_BEGIN (BKE_view_layer_visible_objects_iterator_begin, \ BKE_view_layer_visible_objects_iterator_next, \ BKE_view_layer_visible_objects_iterator_end, \ @@ -404,10 +404,9 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_VISIBLE_BASE_BEGIN(_view_layer, _v3d, _instance) \ { \ - struct ObjectsVisibleIteratorData data_ = { \ - .view_layer = _view_layer, \ - .v3d = _v3d, \ - }; \ + struct ObjectsVisibleIteratorData data_ = {}; \ + data_.view_layer = _view_layer; \ + data_.v3d = _v3d; \ ITER_BEGIN (BKE_view_layer_visible_bases_iterator_begin, \ BKE_view_layer_visible_bases_iterator_next, \ BKE_view_layer_visible_bases_iterator_end, \ @@ -437,10 +436,9 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter); IteratorBeginCb func_begin; \ IteratorCb func_next, func_end; \ void *data_in; \ - struct ObjectsVisibleIteratorData data_ = { \ - .view_layer = _view_layer, \ - .v3d = _v3d, \ - }; \ + struct ObjectsVisibleIteratorData data_ = {}; \ + data_.view_layer = _view_layer; \ + data_.v3d = _v3d; \ \ if (flag == SELECT) { \ func_begin = &BKE_view_layer_selected_objects_iterator_begin; \ |