diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-26 11:46:55 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-26 12:05:04 +0300 |
| commit | b27775138beedb20405756d5bbce01173b16fb74 (patch) | |
| tree | 6d119e76c7110ac7e303f0425bad74538aa7b382 /source/blender/draw | |
| parent | dc1f491a506deafbd80f13b20783e477ef5f99fd (diff) | |
Pass depsgraph via Context to selection code
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/DRW_engine.h | 4 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 03ba8e39447..8d1188cb3b7 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -28,6 +28,7 @@ struct ARegion; struct CollectionEngineSettings; +struct Depsgraph; struct DRWPass; struct Material; struct Scene; @@ -62,7 +63,8 @@ void DRW_engine_viewport_data_size_get( void DRW_draw_view(const struct bContext *C); void DRW_draw_select_loop( - struct ViewContext *vc, struct Scene *scene, struct SceneLayer *sl, struct View3D *v3d, struct ARegion *ar, + struct ViewContext *vc, struct Depsgraph *graph, + struct Scene *scene, struct SceneLayer *sl, struct View3D *v3d, struct ARegion *ar, bool use_obedit_skip, bool use_nearest, const struct rcti *rect); void DRW_object_engine_data_free(struct Object *ob); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index d866a4c52db..7cba39d8bff 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2045,7 +2045,8 @@ void DRW_draw_view(const bContext *C) * object mode select-loop, see: ED_view3d_draw_select_loop (legacy drawing). */ void DRW_draw_select_loop( - struct ViewContext *vc, Scene *scene, struct SceneLayer *sl, View3D *v3d, ARegion *ar, + struct ViewContext *vc, Depsgraph *graph, + Scene *scene, struct SceneLayer *sl, View3D *v3d, ARegion *ar, bool UNUSED(use_obedit_skip), bool UNUSED(use_nearest), const rcti *rect) { #ifndef USE_GPU_SELECT @@ -2115,7 +2116,6 @@ void DRW_draw_select_loop( DRW_engines_cache_populate(vc->obedit); } else { - Depsgraph *graph = scene->depsgraph; // CTX_data_depsgraph(C); DEG_OBJECT_ITER(graph, ob) { if ((ob->base_flag & BASE_SELECTABLED) != 0) { |