diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-12-14 14:20:56 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-12-14 14:20:56 +0300 |
| commit | 0e76ff18b5bac34fb7f3b96c4849024ec9b2c2fb (patch) | |
| tree | c6855aa3a1459c9106d3028c462d5facc802ef59 /source/blender/blenkernel/BKE_layer.h | |
| parent | dc4c1be1a4455e84d1f72ce2703ab7425152965c (diff) | |
Fix T58351: Make Single User crashes
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index db363148bc8..2abdaf103f9 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -301,17 +301,21 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter); } \ } ((void)0) -#define FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, _instance) \ +#define FOREACH_OBJECT_FLAG_BEGIN(scene, _view_layer, _v3d, flag, _instance) \ { \ IteratorBeginCb func_begin; \ IteratorCb func_next, func_end; \ void *data_in; \ + struct ObjectsVisibleIteratorData data_ = { \ + .view_layer = _view_layer, \ + .v3d = _v3d, \ + }; \ \ if (flag == SELECT) { \ func_begin = &BKE_view_layer_selected_objects_iterator_begin; \ func_next = &BKE_view_layer_selected_objects_iterator_next; \ func_end = &BKE_view_layer_selected_objects_iterator_end; \ - data_in = (view_layer); \ + data_in = &data_; \ } \ else { \ func_begin = BKE_scene_objects_iterator_begin; \ |