[Bf-blender-cvs] [a562e1fa81d] soc-2019-npr: Gpencil: Renamed "Backbone" into "Length" modifier.
YimingWu
noreply at git.blender.org
Tue Jul 2 08:39:35 CEST 2019
Commit: a562e1fa81dd60cdd415384ac5b4aac026f4b995
Author: YimingWu
Date: Tue Jul 2 14:38:56 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBa562e1fa81dd60cdd415384ac5b4aac026f4b995
Gpencil: Renamed "Backbone" into "Length" modifier.
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
R085 source/blender/gpencil_modifiers/intern/MOD_gpencilbackbonestretch.c source/blender/gpencil_modifiers/intern/MOD_gpencillength.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 bc8d415fb1b..cb390b09fa4 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -2327,7 +2327,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col = layout.column()
col.prop(md, "length")
- def GP_BACKBONE(self, layout, ob, md):
+ def GP_LENGTH(self, layout, ob, md):
col = layout.column()
col.prop(md, "length")
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index 245daadd393..a098ee4bbcc 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -62,7 +62,7 @@ set(SRC
intern/MOD_gpencilthick.c
intern/MOD_gpenciltime.c
intern/MOD_gpenciltint.c
- intern/MOD_gpencilbackbonestretch.c
+ intern/MOD_gpencillength.c
MOD_gpencil_modifiertypes.h
)
diff --git a/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h b/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
index 60bc02fc26e..cd9cb01b341 100644
--- a/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
+++ b/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
@@ -43,7 +43,7 @@ extern GpencilModifierTypeInfo modifierType_Gpencil_Offset;
extern GpencilModifierTypeInfo modifierType_Gpencil_Armature;
extern GpencilModifierTypeInfo modifierType_Gpencil_Time;
extern GpencilModifierTypeInfo modifierType_Gpencil_Sample;
-extern GpencilModifierTypeInfo modifierType_Gpencil_Backbone;
+extern GpencilModifierTypeInfo modifierType_Gpencil_Length;
/* MOD_gpencil_util.c */
void gpencil_modifier_type_init(GpencilModifierTypeInfo *types[]);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index b506668f29b..526bf71db6e 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -59,7 +59,7 @@ void gpencil_modifier_type_init(GpencilModifierTypeInfo *types[])
INIT_GP_TYPE(Subdiv);
INIT_GP_TYPE(Simplify);
INIT_GP_TYPE(Sample);
- INIT_GP_TYPE(Backbone);
+ INIT_GP_TYPE(Length);
INIT_GP_TYPE(Thick);
INIT_GP_TYPE(Tint);
INIT_GP_TYPE(Color);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbackbonestretch.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
similarity index 85%
rename from source/blender/gpencil_modifiers/intern/MOD_gpencilbackbonestretch.c
rename to source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
index 278e170af84..d9ad423ef32 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbackbonestretch.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
@@ -18,8 +18,6 @@
* The Original Code is Copyright (C) 2017, Blender Foundation
* This is a new part of Blender
*
- * Contributor(s): Antonio Vazquez, Joshua Leung, Yiming Wu
- *
* ***** END GPL LICENSE BLOCK *****
*
*/
@@ -70,7 +68,7 @@
static void initData(GpencilModifierData *md)
{
- BackboneGpencilModifierData *gpmd = (BackboneGpencilModifierData *)md;
+ LengthGpencilModifierData *gpmd = (LengthGpencilModifierData *)md;
}
static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
@@ -88,7 +86,7 @@ static void bakeModifier(Main *UNUSED(bmain),
for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
- BackboneGpencilModifierData *lmd = (BackboneGpencilModifierData *)md;
+ LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
bGPDstroke *gps;
for (gps = gpf->strokes.first; gps; gps = gps->next) {
BKE_gpencil_stretch_stroke(gps, lmd->length);
@@ -104,7 +102,7 @@ static void bakeModifier(Main *UNUSED(bmain),
static void generateStrokes(
GpencilModifierData *md, Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf)
{
- BackboneGpencilModifierData *lmd = (BackboneGpencilModifierData *)md;
+ LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
bGPDstroke *gps;
for (gps = gpf->strokes.first; gps; gps = gps->next) {
BKE_gpencil_stretch_stroke(gps, lmd->length);
@@ -113,7 +111,7 @@ static void generateStrokes(
static void updateDepsgraph(GpencilModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
{
- BackboneGpencilModifierData *lmd = (BackboneGpencilModifierData *)md;
+ LengthGpencilModifierData *lmd = (LengthGpencilModifierData *)md;
}
static void foreachObjectLink(GpencilModifierData *md,
@@ -121,13 +119,13 @@ static void foreachObjectLink(GpencilModifierData *md,
ObjectWalkFunc walk,
void *userData)
{
- BackboneGpencilModifierData *mmd = (BackboneGpencilModifierData *)md;
+ LengthGpencilModifierData *mmd = (LengthGpencilModifierData *)md;
}
-GpencilModifierTypeInfo modifierType_Gpencil_Backbone = {
- /* name */ "Backbone Stretch",
- /* structName */ "BackboneGpencilModifierData",
- /* structSize */ sizeof(BackboneGpencilModifierData),
+GpencilModifierTypeInfo modifierType_Gpencil_Length = {
+ /* name */ "Length Stretch",
+ /* structName */ "LengthGpencilModifierData",
+ /* structSize */ sizeof(LengthGpencilModifierData),
/* type */ eGpencilModifierTypeType_Gpencil,
/* flags */ 0,
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index c18b04e1d37..69ba088342d 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -49,7 +49,7 @@ typedef enum GpencilModifierType {
eGpencilModifierType_Armature = 15,
eGpencilModifierType_Time = 16,
eGpencilModifierType_Sample = 17,
- eGpencilModifierType_Backbone = 18,
+ eGpencilModifierType_Length = 18,
NUM_GREASEPENCIL_MODIFIER_TYPES
} GpencilModifierType;
@@ -606,10 +606,10 @@ typedef struct SampleGpencilModifierData {
char _pad[4];
} SampleGpencilModifierData;
-typedef struct BackboneGpencilModifierData {
+typedef struct LengthGpencilModifierData {
GpencilModifierData modifier;
float length;
char _pad[4];
-} BackboneGpencilModifierData;
+} LengthGpencilModifierData;
#endif /* __DNA_GPENCIL_MODIFIER_TYPES_H__ */
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 37092a7e450..486b9224170 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -111,11 +111,11 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = {
"Thickness",
"Change stroke thickness"},
{eGpencilModifierType_Time, "GP_TIME", ICON_MOD_TIME, "Time Offset", "Offset keyframes"},
- {eGpencilModifierType_Backbone,
- "GP_BACKBONE",
+ {eGpencilModifierType_Length,
+ "GP_LENGTH",
ICON_MOD_EDGESPLIT,
- "Backbone Stretch",
- "Extend the end points of a stroke to a specific length"},
+ "Length",
+ "Extend or shrink strokes"},
{0, "", 0, N_("Color"), ""},
{eGpencilModifierType_Color,
"GP_COLOR",
@@ -215,8 +215,8 @@ static StructRNA *rna_GpencilModifier_refine(struct PointerRNA *ptr)
return &RNA_ArmatureGpencilModifier;
case eGpencilModifierType_Sample:
return &RNA_SampleGpencilModifier;
- case eGpencilModifierType_Backbone:
- return &RNA_BackboneGpencilModifier;
+ case eGpencilModifierType_Length:
+ return &RNA_LengthGpencilModifier;
/* Default */
case eGpencilModifierType_None:
case NUM_GREASEPENCIL_MODIFIER_TYPES:
@@ -1721,9 +1721,9 @@ static void rna_def_modifier_gpencilbackbone(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
- srna = RNA_def_struct(brna, "BackboneGpencilModifier", "GpencilModifier");
- RNA_def_struct_ui_text(srna, "Backbone Stretch Modifier", "Stretch the end points of strokes");
- RNA_def_struct_sdna(srna, "BackboneGpencilModifierData");
+ srna = RNA_def_struct(brna, "LengthGpencilModifier", "GpencilModifier");
+ RNA_def_struct_ui_text(srna, "Length Modifier", "Stretch or shrink strokes");
+ RNA_def_struct_sdna(srna, "LengthGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_EDGESPLIT);
prop = RNA_def_property(srna, "length", PROP_FLOAT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list