[Bf-blender-cvs] [ce63cc6b8b1] greasepencil-object: GPencil: Add custom curves to some modifiers
Antonio Vazquez
noreply at git.blender.org
Fri Mar 6 22:06:47 CET 2020
Commit: ce63cc6b8b18cb164da3dc2d3ec6bed69c19f6f5
Author: Antonio Vazquez
Date: Fri Mar 6 22:02:44 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBce63cc6b8b18cb164da3dc2d3ec6bed69c19f6f5
GPencil: Add custom curves to some modifiers
This allows to customize the effect along the stroke.
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesrna/intern/rna_gpencil_modifier.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 8f226f8342a..0c819cce504 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1746,7 +1746,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
# ...to avoid lengthy if statements
# so each type must have a function here.
- def gpencil_masking(self, layout, ob, md, use_vertex):
+ def gpencil_masking(self, layout, ob, md, use_vertex, use_curve=False):
gpd = ob.data
layout.separator()
layout.label(text="Influence Filters:")
@@ -1786,6 +1786,13 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT')
+ if use_curve:
+ col = layout.column()
+ col.separator()
+ col.prop(md, "use_custom_curve")
+ if md.use_custom_curve:
+ col.template_curve_mapping(md, "curve")
+
def GP_NOISE(self, layout, ob, md):
split = layout.split()
@@ -1810,12 +1817,8 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col.separator()
col.prop(md, "noise_scale")
- col.prop(md, "use_custom_curve")
- if md.use_custom_curve:
- col.template_curve_mapping(md, "curve")
-
- self.gpencil_masking(layout, ob, md, True)
+ self.gpencil_masking(layout, ob, md, True, True)
def GP_SMOOTH(self, layout, ob, md):
col = layout.column()
@@ -1829,7 +1832,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "use_edit_thickness", text="Thickness", toggle=True)
row.prop(md, "use_edit_uv", text="UV", toggle=True)
- self.gpencil_masking(layout, ob, md, True)
+ self.gpencil_masking(layout, ob, md, True, True)
def GP_SUBDIV(self, layout, ob, md):
layout.row().prop(md, "subdivision_type", expand=True)
@@ -1872,14 +1875,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
else:
col.prop(md, "thickness_factor")
- col.separator()
-
- col.prop(md, "use_custom_curve")
-
- if md.use_custom_curve:
- col.template_curve_mapping(md, "curve")
-
- self.gpencil_masking(layout, ob, md, True)
+ self.gpencil_masking(layout, ob, md, True, True)
def GP_TINT(self, layout, ob, md):
split = layout.split()
@@ -1891,7 +1887,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row = layout.row()
row.prop(md, "modify_color")
- self.gpencil_masking(layout, ob, md, False)
+ self.gpencil_masking(layout, ob, md, False, True)
def GP_TIME(self, layout, ob, md):
gpd = ob.data
@@ -1948,7 +1944,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row = layout.row()
row.prop(md, "modify_color")
- self.gpencil_masking(layout, ob, md, False)
+ self.gpencil_masking(layout, ob, md, False, True)
def GP_OPACITY(self, layout, ob, md):
split = layout.split()
@@ -1957,7 +1953,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "factor")
col.prop(md, "modify_color")
- self.gpencil_masking(layout, ob, md, True)
+ self.gpencil_masking(layout, ob, md, True, True)
def GP_ARRAY(self, layout, ob, md):
col = layout.column()
@@ -2158,7 +2154,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col.separator()
col.prop(md, "vertex_mode")
- self.gpencil_masking(layout, ob, md, True)
+ self.gpencil_masking(layout, ob, md, True, True)
classes = (
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d2cbdb700a3..01ab4c0603a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5768,13 +5768,49 @@ static void direct_link_gpencil_modifiers(FileData *fd, ListBase *lb)
gpmd->curve_thickness = newdataadr(fd, gpmd->curve_thickness);
if (gpmd->curve_thickness) {
direct_link_curvemapping(fd, gpmd->curve_thickness);
- /* initialize the curve. Maybe this could be moved to modififer logic */
BKE_curvemapping_initialize(gpmd->curve_thickness);
}
}
else if (md->type == eGpencilModifierType_Vertexcolor) {
- VertexcolorGpencilModifierData *hmd = (VertexcolorGpencilModifierData *)md;
- hmd->colorband = newdataadr(fd, hmd->colorband);
+ VertexcolorGpencilModifierData *gpmd = (VertexcolorGpencilModifierData *)md;
+ gpmd->colorband = newdataadr(fd, gpmd->colorband);
+ gpmd->curve_intensity = newdataadr(fd, gpmd->curve_intensity);
+ if (gpmd->curve_intensity) {
+ direct_link_curvemapping(fd, gpmd->curve_intensity);
+ BKE_curvemapping_initialize(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Smooth) {
+ SmoothGpencilModifierData *gpmd = (SmoothGpencilModifierData *)md;
+ gpmd->curve_intensity = newdataadr(fd, gpmd->curve_intensity);
+ if (gpmd->curve_intensity) {
+ direct_link_curvemapping(fd, gpmd->curve_intensity);
+ BKE_curvemapping_initialize(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Color) {
+ ColorGpencilModifierData *gpmd = (ColorGpencilModifierData *)md;
+ gpmd->curve_intensity = newdataadr(fd, gpmd->curve_intensity);
+ if (gpmd->curve_intensity) {
+ direct_link_curvemapping(fd, gpmd->curve_intensity);
+ BKE_curvemapping_initialize(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Tint) {
+ TintGpencilModifierData *gpmd = (TintGpencilModifierData *)md;
+ gpmd->curve_intensity = newdataadr(fd, gpmd->curve_intensity);
+ if (gpmd->curve_intensity) {
+ direct_link_curvemapping(fd, gpmd->curve_intensity);
+ BKE_curvemapping_initialize(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Opacity) {
+ OpacityGpencilModifierData *gpmd = (OpacityGpencilModifierData *)md;
+ gpmd->curve_intensity = newdataadr(fd, gpmd->curve_intensity);
+ if (gpmd->curve_intensity) {
+ direct_link_curvemapping(fd, gpmd->curve_intensity);
+ BKE_curvemapping_initialize(gpmd->curve_intensity);
+ }
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 65875c8ab84..2035ee3590f 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1064,6 +1064,41 @@ static void do_version_curvemapping_walker(Main *bmain, void (*callback)(CurveMa
else if (md->type == eGpencilModifierType_Noise) {
NoiseGpencilModifierData *gpmd = (NoiseGpencilModifierData *)md;
+ if (gpmd->curve_intensity) {
+ callback(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Vertexcolor) {
+ VertexcolorGpencilModifierData *gpmd = (VertexcolorGpencilModifierData *)md;
+
+ if (gpmd->curve_intensity) {
+ callback(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Smooth) {
+ SmoothGpencilModifierData *gpmd = (SmoothGpencilModifierData *)md;
+
+ if (gpmd->curve_intensity) {
+ callback(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Color) {
+ ColorGpencilModifierData *gpmd = (ColorGpencilModifierData *)md;
+
+ if (gpmd->curve_intensity) {
+ callback(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Opacity) {
+ OpacityGpencilModifierData *gpmd = (OpacityGpencilModifierData *)md;
+
+ if (gpmd->curve_intensity) {
+ callback(gpmd->curve_intensity);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Tint) {
+ TintGpencilModifierData *gpmd = (TintGpencilModifierData *)md;
+
if (gpmd->curve_intensity) {
callback(gpmd->curve_intensity);
}
@@ -4611,17 +4646,17 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
break;
}
case eGpencilModifierType_Noise: {
- NoiseGpencilModifierData *gpmd = (NoiseGpencilModifierData *)md;
- gpmd->factor /= 25.0f;
- gpmd->factor_thickness = gpmd->factor;
- gpmd->factor_strength = gpmd->factor;
- gpmd->factor_uvs = gpmd->factor;
- gpmd->noise_scale = (gpmd->flag & GP_NOISE_FULL_STROKE) ? 0.0f : 1.0f;
-
- if (gpmd->curve_intensity == NULL) {
- gpmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- if (gpmd->curve_intensity) {
- BKE_curvemapping_initialize(gpmd->curve_intensity);
+ NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
+ mmd->factor /= 25.0f;
+ mmd->factor_thickness = mmd->factor;
+ mmd->factor_strength = mmd->factor;
+ mmd->factor_uvs = mmd->factor;
+ mmd->noise_scale = (mmd->flag & GP_NOISE_FULL_STROKE) ? 0.0f : 1.0f;
+
+ if (mmd->curve_intensity == NULL) {
+ mmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ if (mmd->curve_intensity) {
+ BKE_curvemapping_initialize(mmd->curve_intensity);
}
}
break;
@@ -4629,6 +4664,42 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
case eGpencilModifierType_Tint: {
TintGpencilModifierData *mmd = (TintGpencilModifierData *)md;
srgb_to_linearrgb_v3_v3(mmd->rgb, mmd->rgb);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list