blender
/
blender
134
399
Fork 582
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

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
This commit is contained in:
Antonio Vazquez 2019-08-06 18:53:24 +02:00
parent 467b0aa227
commit 317033a1be
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -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):

6
source/blender/editors/gpencil/annotate_paint.c
View File

@ -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);

1
source/blender/makesdna/DNA_userdef_types.h
View File

@ -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 {

4
source/blender/makesrna/intern/rna_userdef.c
View File

@ -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);