[Bf-blender-cvs] [a99e24dee83] temp-gpencil-interpolate: GPencil: Fix merge errors

[Antonio Vazquez]

Commit: a99e24dee836503efdf9a6aa0dd8cb4472c86ff5
Author: Antonio Vazquez
Date:   Sun Feb 7 18:58:02 2021 +0100
Branches: temp-gpencil-interpolate
https://developer.blender.org/rBa99e24dee836503efdf9a6aa0dd8cb4472c86ff5

GPencil: Fix merge errors

This variable has been removed in this branch

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 0ce5240b17d..df336e91b03 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -168,7 +168,7 @@ static void scene_init_data(ID *id)
                      CURVE_PRESET_BELL,
                      CURVEMAP_SLOPE_POSITIVE);
   /* Grease pencil interpolate. */
-  scene->toolsettings->gp_interpolate.step = 1;
+  // scene->toolsettings->gp_interpolate.step = 1;
 
   scene->unit.system = USER_UNIT_METRIC;
   scene->unit.scale_length = 1.0f;