Merge branch 'master' into blender2.8
[blender.git] / source / blender / draw / engines / gpencil / gpencil_engine.c
index 0e998363ec5d62354da7ee1196595f4207b33614..dc62ca34c929f5c3eeb23f8addbfd510bd9934b9 100644 (file)
@@ -116,7 +116,7 @@ static void GPENCIL_create_framebuffers(void *vedata)
 
                /* create multiframe framebuffer for AA */
                if ((stl->storage->framebuffer_flag & GP_FRAMEBUFFER_MULTISAMPLE) &&
-                       (stl->storage->multisamples > 0))
+                   (stl->storage->multisamples > 0))
                {
                        DRW_gpencil_multisample_ensure(vedata, size[0], size[1]);
                }
@@ -289,6 +289,9 @@ static void GPENCIL_engine_free(void)
        GPU_BATCH_DISCARD_SAFE(e_data.batch_buffer_fill);
        MEM_SAFE_FREE(e_data.batch_buffer_fill);
 
+       GPU_BATCH_DISCARD_SAFE(e_data.batch_buffer_ctrlpoint);
+       MEM_SAFE_FREE(e_data.batch_buffer_ctrlpoint);
+
        GPU_BATCH_DISCARD_SAFE(e_data.batch_grid);
        MEM_SAFE_FREE(e_data.batch_grid);