[Bf-blender-cvs] [dc43067cae8] greasepencil-object: Cleanup: Rename passindex to pass_index
Antonio Vazquez
noreply at git.blender.org
Fri Oct 20 10:04:41 CEST 2017
Commit: dc43067cae834a031bbabf0fae780784ea0a7f79
Author: Antonio Vazquez
Date: Fri Oct 20 10:03:00 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdc43067cae834a031bbabf0fae780784ea0a7f79
Cleanup: Rename passindex to pass_index
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_gpencilcolor.c
M source/blender/modifiers/intern/MOD_gpencildupli.c
M source/blender/modifiers/intern/MOD_gpencillattice.c
M source/blender/modifiers/intern/MOD_gpencilnoise.c
M source/blender/modifiers/intern/MOD_gpencilopacity.c
M source/blender/modifiers/intern/MOD_gpencilsimplify.c
M source/blender/modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/modifiers/intern/MOD_gpencilthick.c
M source/blender/modifiers/intern/MOD_gpenciltint.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index fad89cb4384..7491d8170a7 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1568,7 +1568,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "inverse_vertex", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
row = layout.row(align=True)
@@ -1587,7 +1587,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "level")
row.prop(md, "simple", text="", icon="PARTICLE_POINT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
col = split.column()
@@ -1604,7 +1604,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row = col.row(align=True)
row.prop(md, "factor")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
col = split.column()
@@ -1621,7 +1621,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row = col.row(align=True)
row.prop(md, "thickness")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
col = split.column()
@@ -1656,7 +1656,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop_search(md, "layer", gpd, "layers", text="", icon="GREASEPENCIL")
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
row = layout.row()
@@ -1678,7 +1678,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop_search(md, "layer", gpd, "layers", text="", icon="GREASEPENCIL")
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
row = layout.row()
@@ -1704,7 +1704,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "inverse_vertex", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
def GP_ARRAY(self, layout, ob, md):
@@ -1756,7 +1756,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop_search(md, "layer", gpd, "layers", text="", icon="GREASEPENCIL")
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
row = layout.row()
@@ -1797,7 +1797,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "inverse_vertex", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
- row.prop(md, "passindex", text="Pass")
+ row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
layout.separator()
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 780545f2cd9..6f967569b37 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -197,7 +197,7 @@ void BKE_gpencil_noise_modifier(
float weight = 1.0f;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 3, gpl, gps,
+ mmd->layername, mmd->pass_index, 3, gpl, gps,
mmd->flag & GP_NOISE_INVERSE_LAYER, mmd->flag & GP_NOISE_INVERSE_PASS))
{
return;
@@ -318,7 +318,7 @@ void BKE_gpencil_subdiv_modifier(
int i2;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 3, gpl, gps,
+ mmd->layername, mmd->pass_index, 3, gpl, gps,
mmd->flag & GP_SUBDIV_INVERSE_LAYER, mmd->flag & GP_SUBDIV_INVERSE_PASS))
{
return;
@@ -401,7 +401,7 @@ void BKE_gpencil_thick_modifier(
float curvef = 1.0;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 3, gpl, gps,
+ mmd->layername, mmd->pass_index, 3, gpl, gps,
mmd->flag & GP_THICK_INVERSE_LAYER, mmd->flag & GP_THICK_INVERSE_PASS))
{
return;
@@ -435,7 +435,7 @@ void BKE_gpencil_tint_modifier(
bGPDspoint *pt;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 1, gpl, gps,
+ mmd->layername, mmd->pass_index, 1, gpl, gps,
mmd->flag & GP_TINT_INVERSE_LAYER, mmd->flag & GP_TINT_INVERSE_PASS))
{
return;
@@ -473,7 +473,7 @@ void BKE_gpencil_color_modifier(
PaletteColor *palcolor;
float hsv[3], factor[3];
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 1, gpl, gps,
+ mmd->layername, mmd->pass_index, 1, gpl, gps,
mmd->flag & GP_COLOR_INVERSE_LAYER, mmd->flag & GP_COLOR_INVERSE_PASS))
{
return;
@@ -504,7 +504,7 @@ void BKE_gpencil_opacity_modifier(
float weight = 1.0f;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 3, gpl, gps,
+ mmd->layername, mmd->pass_index, 3, gpl, gps,
mmd->flag & GP_OPACITY_INVERSE_LAYER, mmd->flag & GP_OPACITY_INVERSE_PASS))
{
return;
@@ -581,7 +581,7 @@ void BKE_gpencil_dupli_modifier(
for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
stroke++;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 1, gpl, gps,
+ mmd->layername, mmd->pass_index, 1, gpl, gps,
mmd->flag & GP_DUPLI_INVERSE_LAYER, mmd->flag & GP_DUPLI_INVERSE_PASS))
{
continue;
@@ -757,7 +757,7 @@ void BKE_gpencil_lattice_modifier(
float weight = 1.0f;
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 3, gpl, gps,
+ mmd->layername, mmd->pass_index, 3, gpl, gps,
mmd->flag & GP_LATTICE_INVERSE_LAYER, mmd->flag & GP_LATTICE_INVERSE_PASS))
{
return;
@@ -947,7 +947,7 @@ void BKE_gpencil_simplify_stroke(bGPDlayer *UNUSED(gpl), bGPDstroke *gps, float
void BKE_gpencil_simplify_modifier(int UNUSED(id), GpencilSimplifyModifierData *mmd, Object *UNUSED(ob), bGPDlayer *gpl, bGPDstroke *gps)
{
if (!is_stroke_affected_by_modifier(
- mmd->layername, mmd->passindex, 4, gpl, gps,
+ mmd->layername, mmd->pass_index, 4, gpl, gps,
mmd->flag & GP_SIMPLIFY_INVERSE_LAYER, mmd->flag & GP_SIMPLIFY_INVERSE_PASS))
{
return;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 43cb61fa17f..492c4643ae2 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1641,7 +1641,7 @@ typedef struct GpencilNoiseModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
- int passindex; /* custom index for passes */
+ int pass_index; /* custom index for passes */
int flag; /* several flags */
float factor; /* factor of noise */
int step; /* how many frames before recalculate randoms */
@@ -1666,7 +1666,7 @@ typedef enum eGpencilNoise_Flag {
typedef struct GpencilSubdivModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
- int passindex; /* custom index for passes */
+ int pass_index; /* custom index for passes */
int flag; /* flags */
int level; /* factor of subdivision */
char pad[4];
@@ -1682,7 +1682,7 @@ typedef struct GpencilThickModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
- int passindex; /* custom index for passes */
+ int pass_index; /* custom index for passes */
int flag; /* flags */
int thickness; /* Thickness change */
char pad[4];
@@ -1699,7 +1699,7 @@ typedef enum eGpencilThick_Flag {
typedef struct GpencilTintModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
- int passindex; /* custom index for passes */
+ int pass_index; /* custom index for passes */
int flag; /* flags */
float rgb[3]; /* Tint color */
float factor; /* Mix factor */
@@ -1714,7 +1714,7 @@ typedef enum eGpencilTint_Flag {
typedef struct GpencilColorModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
- int passindex; /* custom index for passes */
+ int pass_index; /* custom index for passes */
int flag; /* flags */
float hsv[3]; /* hsv factors */
char pad[4];
@@ -1730,7 +1730,7 @@ typedef struct GpencilOpacityModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
- int passindex; /* custom index for passes */
+ int
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list