Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPencil: Smooth and Subdivision variable/setting naming

Browse Source 
On second thought, these might be better names for these... I'm still not 100%
happy with these, but they will do for now.

(Best results currently seem to be with smooth 0.7, and subdivision steps 1 or 2)
This commit is contained in:
Joshua Leung
2016-03-28 03:20:15 +13:00
parent fd8f51da08
commit 2bb956f6c9
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@@ -626,9 +626,8 @@ class GreasePencilDataPanel:
layout.separator() layout.separator()
col = layout.column(align=True) col = layout.column(align=True)
col.label(text="New Stroke Quality:") col.label(text="New Stroke Quality:")
split = col.split() col.prop(gpl, "pen_smooth_factor")
split.prop(gpl, "smooth_drawfac") col.prop(gpl, "pen_subdivision_steps")
split.prop(gpl, "subdivision")
class GreasePencilToolsPanel: class GreasePencilToolsPanel:

4
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -750,9 +750,9 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
} }
/* smooth stroke - only if there's something to do */ /* smooth stroke - only if there's something to do */
if (gpl->smooth_drawfac > 0.0f) { if (gpl->draw_smoothfac > 0.0f) {
for (i = 0; i < gps->totpoints; i++) { for (i = 0; i < gps->totpoints; i++) {
gp_smooth_stroke(gps, i, gpl->smooth_drawfac, true); gp_smooth_stroke(gps, i, gpl->draw_smoothfac, true);
} }
} }

4
source/blender/makesdna/DNA_gpencil_types.h
View File

@@ -131,8 +131,8 @@ typedef struct bGPDlayer {
char info[128]; /* optional reference info about this layer (i.e. "director's comments, 12/3") char info[128]; /* optional reference info about this layer (i.e. "director's comments, 12/3")
* this is used for the name of the layer too and kept unique. */ * this is used for the name of the layer too and kept unique. */
float smooth_drawfac; /* factor used for dynamic smooth of strokes */ float draw_smoothfac; /* amount of smoothing to apply to newly created strokes */
short sublevel; /* subdivision level */ short sublevel; /* number of times to subdivide new strokes */
short pad[5]; /* padding for compiler error */ short pad[5]; /* padding for compiler error */
} bGPDlayer; } bGPDlayer;

12
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -797,18 +797,18 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "After Color", "Base color for ghosts after the active frame"); RNA_def_property_ui_text(prop, "After Color", "Base color for ghosts after the active frame");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* dynamic smooth factor */ /* Smoothing factor for new strokes */
prop = RNA_def_property(srna, "smooth_drawfac", PROP_FLOAT, PROP_NONE); prop = RNA_def_property(srna, "pen_smooth_factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "smooth_drawfac"); RNA_def_property_float_sdna(prop, NULL, "draw_smoothfac");
RNA_def_property_range(prop, 0.0, 2.0f); RNA_def_property_range(prop, 0.0, 2.0f);
RNA_def_property_ui_text(prop, "Smooth", "Amount of smoothing to apply to newly created strokes, to reduce jitter/noise"); RNA_def_property_ui_text(prop, "Smooth", "Amount of smoothing to apply to newly created strokes, to reduce jitter/noise");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* Subdivision level */ /* Subdivision level for new strokes */
prop = RNA_def_property(srna, "subdivision", PROP_INT, PROP_NONE); prop = RNA_def_property(srna, "pen_subdivision_steps", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "sublevel"); RNA_def_property_int_sdna(prop, NULL, "sublevel");
RNA_def_property_range(prop, 0, 3); RNA_def_property_range(prop, 0, 3);
RNA_def_property_ui_text(prop, "Subdivide", "Number of times to subdivide newly created strokes, for less jagged strokes"); RNA_def_property_ui_text(prop, "Subdivision Steps", "Number of times to subdivide newly created strokes, for less jagged strokes");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* Flags */ /* Flags */