diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-21 12:42:59 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-21 14:00:40 +0300 |
| commit | 4b77fb30759d1b62224033fc92c55eef7f3e414a (patch) | |
| tree | e861012341093bb46f19ee1d9952f4db76b4dad8 /source/blender/blenkernel | |
| parent | 3540b507801461d30d6a856daa26efda15011f79 (diff) | |
Move DEG_OBJECT_ITER inside depsgraph
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index b91ff82dc9f..f19f9a65bb5 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -215,33 +215,6 @@ void BKE_visible_bases_Iterator_end(Iterator *iter); ITER_END \ } -/* temporary hacky solution waiting for CoW depsgraph implementation */ -#define DEG_OBJECT_ITER(graph_, instance_) \ -{ \ - Scene *sce_, *scene_ = DAG_get_scene(graph_); \ - SceneLayer *sl_ = DAG_get_scene_layer(graph_); \ - int flag_ = ~(BASE_FROM_SET); \ - \ - /* flush all the depsgraph data to objects */ \ - Object *instance_; \ - Base *base_; \ - for(sce_ = scene_; sce_; sce_ = sce_->set) { \ - for (base_ = (sl_)->object_bases.first; base_; base_ = base_->next) { \ - if ((base_->flag & BASE_VISIBLED) != 0) { \ - instance_ = base_->object; \ - instance_->base_flag = (base_->flag | BASE_FROM_SET) & flag_; \ - instance_->base_collection_properties = base_->collection_properties; - -#define DEG_OBJECT_ITER_END \ - } \ - } \ - if (sce_->set) { \ - sl_ = BKE_scene_layer_render_active(sce_->set); \ - flag_ = ~(BASE_SELECTED | BASE_SELECTABLED); \ - } \ - } \ -} - #ifdef __cplusplus } #endif |