[Bf-blender-cvs] [e006e660843] master: Cleanup: use struct member identifiers for initialization
Campbell Barton
noreply at git.blender.org
Thu Mar 24 07:34:22 CET 2022
Commit: e006e6608437c16102774879824bc9644acb3521
Author: Campbell Barton
Date: Thu Mar 24 17:30:45 2022 +1100
Branches: master
https://developer.blender.org/rBe006e6608437c16102774879824bc9644acb3521
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++.
===================================================================
M source/blender/blenkernel/BKE_layer.h
===================================================================
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; \
More information about the Bf-blender-cvs
mailing list