[Bf-blender-cvs] [9b469ee9d03] greasepencil-object: GPencil: Fix merge error

Antonio Vazquez noreply at git.blender.org
Sat Dec 12 19:02:57 CET 2020


Commit: 9b469ee9d0312ef364722f46c9a8efc02b68e4ba
Author: Antonio Vazquez
Date:   Sat Dec 12 19:02:50 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB9b469ee9d0312ef364722f46c9a8efc02b68e4ba

GPencil: Fix merge error

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

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

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

diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 8d25928e2d4..70090f0c769 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -3420,8 +3420,6 @@ void BKE_gpencil_stroke_uniform_subdivide(bGPdata *gpd,
   BKE_gpencil_stroke_geometry_update(gpd, gps);
 }
 
-}
-
 /**
  * Stroke to view space
  * Transforms a stroke to view space. This allows for manipulations in 2D but also easy conversion



More information about the Bf-blender-cvs mailing list