diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:11:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:23:41 +0300 |
| commit | c35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 (patch) | |
| tree | 698066b5eade15949b0453796c4d9fc466df42ac /source/blender/editors/gpencil/gpencil_utils.c | |
| parent | 09d26cab0bdde16529debd3e0271252012ba69eb (diff) | |
Farewell Scene->basact
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_utils.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 4023a343b22..dfefd1aa745 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -204,15 +204,15 @@ bGPdata *ED_gpencil_data_get_active(const bContext *C) /* -------------------------------------------------------- */ // XXX: this should be removed... We really shouldn't duplicate logic like this! -bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, View3D *v3d) +bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, SceneLayer *scene_layer) { - BaseLegacy *base = scene->basact; + Base *base = scene_layer->basact; bGPdata *gpd = NULL; /* We have to make sure active object is actually visible and selected, else we must use default scene gpd, * to be consistent with ED_gpencil_data_get_active's behavior. */ - if (base && TESTBASE(v3d, base)) { + if (base && TESTBASE_NEW(base)) { gpd = base->object->gpd; } return gpd ? gpd : scene->gpd; |