[Bf-blender-cvs] [0ea09fb5532] greasepencil-object: Fix merge errors

[Antonio Vazquez]

Commit: 0ea09fb5532b0cce8c396b91de2b2e7033d31d61
Author: Antonio Vazquez
Date:   Wed Feb 14 10:45:38 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0ea09fb5532b0cce8c396b91de2b2e7033d31d61

Fix merge errors

===================================================================

M       source/blender/editors/gpencil/gpencil_fill.c
M       source/blender/editors/space_view3d/view3d_draw_legacy.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_fill.c 
b/source/blender/editors/gpencil/gpencil_fill.c
index bd644ad50a8..ef53fcb5ace 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -268,7 +268,7 @@ static void gp_render_offscreen(tGPDfill *tgpf)
        }
 
        char err_out[256] = "unknown";
-       GPUOffScreen *offscreen = GPU_offscreen_create(tgpf->sizex, 
tgpf->sizey, 0, false, err_out);
+       GPUOffScreen *offscreen = GPU_offscreen_create(tgpf->sizex, 
tgpf->sizey, 0, true, false, err_out);
        GPU_offscreen_bind(offscreen, true);
        unsigned int flag = IB_rect | IB_rectfloat;
        ImBuf *ibuf = IMB_allocImBuf(tgpf->sizex, tgpf->sizey, 32, flag);
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c 
b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 8378f1ad6db..1d5276a4ba2 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -1499,7 +1499,7 @@ static void draw_gpencil_object_strokes(const bContext 
*C, Scene *scene, const s
        const bool render_override = (v3d->flag2 & V3D_RENDER_OVERRIDE) != 0;
        Object *ob = base->object;
 
-       if (ob != scene->obedit) {
+       if (ob != CTX_data_edit_object(C)) {
                if (ob->restrictflag & OB_RESTRICT_VIEW)
                        return;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs