diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-07-18 12:16:00 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-07-18 12:16:14 +0300 |
commit | c226488a2722560b9a09ed7156b5778850a86895 (patch) | |
tree | 926124ad37008123e38aea07226aef5af33eefd1 /source | |
parent | f3039c7e78a514d54c350ab976758de99133ac87 (diff) |
Layer cleanup: get rid of one of the placeholder functions
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 9 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query.cc | 3 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 3 |
4 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index a3ba9a3e3dc..0a26fe08016 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -61,8 +61,6 @@ struct SceneLayer *BKE_scene_layer_from_workspace_get(const struct WorkSpace *wo struct SceneLayer *BKE_scene_layer_add(struct Scene *scene, const char *name); /* DEPRECATED */ -struct SceneLayer *BKE_scene_layer_context_active_ex_PLACEHOLDER(const struct Main *bmain, const struct Scene *scene); -/* DEPRECATED */ struct SceneLayer *BKE_scene_layer_context_active_PLACEHOLDER(const struct Scene *scene); void BKE_scene_layer_free(struct SceneLayer *sl); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 3342c198ee1..56b9bd2cc1e 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -90,15 +90,6 @@ SceneLayer *BKE_scene_layer_from_workspace_get(const struct WorkSpace *workspace * This is a placeholder to know which areas of the code need to be addressed for the Workspace changes. * Never use this, you should either use BKE_scene_layer_workspace_active or get SceneLayer explicitly. */ -SceneLayer *BKE_scene_layer_context_active_ex_PLACEHOLDER(const Main *UNUSED(bmain), const Scene *scene) -{ - return BKE_scene_layer_from_scene_get(scene); -} - -/** - * This is a placeholder to know which areas of the code need to be addressed for the Workspace changes. - * Never use this, you should either use BKE_scene_layer_workspace_active or get SceneLayer explicitly. - */ SceneLayer *BKE_scene_layer_context_active_PLACEHOLDER(const Scene *scene) { return BKE_scene_layer_from_scene_get(scene); diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index c0e50643102..2ff423acc9c 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -92,8 +92,7 @@ SceneLayer *DEG_get_evaluated_scene_layer(Depsgraph *graph) { Scene *scene = DEG_get_evaluated_scene(graph); if (scene != NULL) { - DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph); - return BKE_scene_layer_context_active_ex_PLACEHOLDER(deg_graph->bmain, scene); + return BKE_scene_layer_context_active_PLACEHOLDER(scene); } return NULL; } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 7219630f519..bfc0400e2a9 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3796,8 +3796,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri void RE_PreviewRender(Render *re, Main *bmain, Scene *sce) { Object *camera; - /* TODO(sergey): Get proper scene layer here. */ - SceneLayer *scene_layer = BKE_scene_layer_context_active_ex_PLACEHOLDER(bmain, sce); + SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(sce); int winx, winy; winx = (sce->r.size * sce->r.xsch) / 100; |