[Bf-blender-cvs] [317033a1be2] master: Annotations: Remove Simplify option from Userprefs

[Antonio Vazquez]

Commit: 317033a1be2ab5d0fa6df861aea416fef1fdb86b
Author: Antonio Vazquez
Date:   Tue Aug 6 18:53:24 2019 +0200
Branches: master
https://developer.blender.org/rB317033a1be2ab5d0fa6df861aea416fef1fdb86b

Annotations: Remove Simplify option from Userprefs

This option was an old option for Grease Pencil tools and it's not logic for Annotations.

Differential Revision: http://developer.blender.org/D5426

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/editors/gpencil/annotate_paint.c
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 08f36bb15bb..48aaf55bdfa 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -427,7 +427,6 @@ class USERPREF_PT_edit_annotations(PreferencePanel, Panel):
 
         flow.prop(edit, "grease_pencil_default_color", text="Default Color")
         flow.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
-        flow.prop(edit, "use_grease_pencil_simplify_stroke", text="Simplify Stroke")
 
 
 class USERPREF_PT_edit_weight_paint(PreferencePanel, Panel):
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 6a635720d09..c9c4a67644e 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -758,12 +758,6 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
     }
   }
 
-  /* Simplify stroke */
-  if ((p->sa->spacetype == SPACE_VIEW3D) && (U.gp_settings & GP_PAINT_DOSIMPLIFY) &&
-      (p->paintmode != GP_PAINTMODE_DRAW_STRAIGHT)) {
-    BKE_gpencil_simplify_stroke(gps, 0.05f);
-  }
-
   /* add stroke to frame */
   BLI_addtail(&p->gpf->strokes, gps);
   gp_stroke_added_enable(p);
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index f8ee29c94cc..b8914c7a74f 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -1069,7 +1069,6 @@ typedef enum eText_Draw_Options {
  * #UserDef.gp_settings */
 typedef enum eGP_UserdefSettings {
   GP_PAINT_UNUSED_0 = (1 << 0),
-  GP_PAINT_DOSIMPLIFY = (1 << 1),
 } eGP_UserdefSettings;
 
 enum {
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index bed06171cbf..38cb3e1d222 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4590,10 +4590,6 @@ static void rna_def_userdef_edit(BlenderRNA *brna)
                            "Grease Pencil Euclidean Distance",
                            "Distance moved by mouse when drawing stroke to include");
 
-  prop = RNA_def_property(srna, "use_grease_pencil_simplify_stroke", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSIMPLIFY);
-  RNA_def_property_ui_text(prop, "Grease Pencil Simplify Stroke", "Simplify the final stroke");
-
   prop = RNA_def_property(srna, "grease_pencil_eraser_radius", PROP_INT, PROP_PIXEL);
   RNA_def_property_int_sdna(prop, NULL, "gp_eraser");
   RNA_def_property_range(prop, 1, 500);