[Bf-blender-cvs] [24cce14c000] greasepencil-object: GPencil: Change defaults for Array modifier

[Antonio Vazquez]

Commit: 24cce14c000d1e6c077b906d7627b6ffc962bd97
Author: Antonio Vazquez
Date:   Thu Feb 27 19:58:40 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB24cce14c000d1e6c077b906d7627b6ffc962bd97

GPencil: Change defaults for Array modifier

- Enable relative offset by default
- Change units for relative offset

===================================================================

M	source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

===================================================================

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index 5466080d982..82a97481748 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -64,15 +64,15 @@ static void initData(GpencilModifierData *md)
 {
   ArrayGpencilModifierData *gpmd = (ArrayGpencilModifierData *)md;
   gpmd->count = 2;
-  gpmd->offset[0] = 1.0f;
-  gpmd->offset[1] = 0.0f;
-  gpmd->offset[2] = 0.0f;
-  zero_v3(gpmd->shift);
+  gpmd->shift[0] = 1.0f;
+  gpmd->shift[1] = 0.0f;
+  gpmd->shift[2] = 0.0f;
+  zero_v3(gpmd->offset);
   copy_v3_fl(gpmd->scale, 1.0f);
   gpmd->rnd_rot = 0.5f;
   gpmd->rnd_size = 0.5f;
   gpmd->object = NULL;
-  gpmd->flag |= GP_ARRAY_USE_OFFSET;
+  gpmd->flag |= GP_ARRAY_USE_RELATIVE;
 
   /* fill random values */
   BLI_array_frand(gpmd->rnd, 20, 1);
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index ee7c903498b..0838bc2a2fb 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -1296,10 +1296,12 @@ static void rna_def_modifier_gpencilarray(BlenderRNA *brna)
   RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "relative_offset", PROP_FLOAT, PROP_TRANSLATION);
+  prop = RNA_def_property(srna, "relative_offset", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_sdna(prop, NULL, "shift");
   RNA_def_property_ui_text(
-      prop, "Relative Offset", "Value for the distance between items bounding box");
+      prop,
+      "Relative Offset",
+      "The size of the geometry will determine the distance between arrayed items");
   RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");