From 65edeb6755bd396f6ee47a605c5de2f460000154 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 19 Aug 2013 22:46:32 +0000 Subject: Fix GPencil part of [#36101] BSurface Throw an Error When Press "Add Surface" gpencil_data_get_active and gpencil_data_get_active_v3d did not have consistent behavior when we had an active object, but not on any visible layer (the first would return the default scene gpd in this case, while the first was still returning active object's one). Now they both return scene's one. --- source/blender/editors/gpencil/gpencil_edit.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/gpencil') diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 99157b074fd..5ed34f0d0f0 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -192,7 +192,16 @@ bGPdata *gpencil_data_get_active(const bContext *C) /* needed for offscreen rendering */ bGPdata *gpencil_data_get_active_v3d(Scene *scene) { - bGPdata *gpd = scene->basact ? scene->basact->object->gpd : NULL; + Base *base = scene->basact; + bGPdata *gpd = base ? base->object->gpd : NULL; + if (base && gpd) { + /* We have to make sure active object is actually visible, else we must use default scene gpd, + * to be consistent with gpencil_data_get_active's behavior. + */ + if ((scene->lay & base->lay) == 0) { + gpd = NULL; + } + } return gpd ? gpd : scene->gpd; } -- cgit v1.2.3