[Bf-blender-cvs] [7a5747d5596] greasepencil-object: Rename Grease Pencil Array Modifier to Instance Modifier
Antonio Vazquez
noreply at git.blender.org
Mon Apr 30 17:09:51 CEST 2018
Commit: 7a5747d5596111c924d415ee6ad009e39705da55
Author: Antonio Vazquez
Date: Mon Apr 30 17:09:42 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7a5747d5596111c924d415ee6ad009e39705da55
Rename Grease Pencil Array Modifier to Instance Modifier
The new name is more clear and does not create confusion with 3D objects array modifier.
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
R089 source/blender/modifiers/intern/MOD_gpencilarray.c source/blender/modifiers/intern/MOD_gpencilinstance.c
M source/blender/modifiers/intern/MOD_util.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index edf75160e01..993f440bc89 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1767,7 +1767,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "pass_index", text="Pass")
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
- def GP_ARRAY(self, layout, ob, md):
+ def GP_INSTANCE(self, layout, ob, md):
gpd = ob.data
col = layout.column()
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 8d943578df7..2832787d3a5 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -50,7 +50,7 @@ struct Brush;
struct Object;
struct bDeformGroup;
struct GpencilSimplifyModifierData;
-struct GpencilArrayModifierData;
+struct GpencilInstanceModifierData;
struct GpencilLatticeModifierData;
/* ------------ Grease-Pencil API ------------------ */
@@ -170,7 +170,7 @@ void BKE_gpencil_geometry_modifiers(
struct Depsgraph *depsgraph, struct Object *ob,
struct bGPDlayer *gpl, struct bGPDframe *gpf, bool is_render);
-void BKE_gpencil_array_modifier_instance_tfm(struct GpencilArrayModifierData *mmd, const int elem_idx[3], float r_mat[4][4]);
+void BKE_gpencil_instance_modifier_instance_tfm(struct GpencilInstanceModifierData *mmd, const int elem_idx[3], float r_mat[4][4]);
void BKE_gpencil_lattice_init(struct Object *ob);
void BKE_gpencil_lattice_clear(struct Object *ob);
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 19ca11721aa..f6155fc2bb2 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -1045,10 +1045,10 @@ struct GPUTexture *DRW_gpencil_create_blank_texture(int width, int height)
return tex;
}
-/* Helper for gpencil_array_modifiers()
- * See also MOD_gpencilarray.c -> bakeModifierGP()
+/* Helper for gpencil_instance_modifiers()
+ * See also MOD_gpencilinstance.c -> bakeModifierGP()
*/
-static void gp_array_modifier_make_instances(GPENCIL_StorageList *stl, Object *ob, GpencilArrayModifierData *mmd)
+static void gp_instance_modifier_make_instances(GPENCIL_StorageList *stl, Object *ob, GpencilInstanceModifierData *mmd)
{
/* reset random */
mmd->rnd[0] = 1;
@@ -1069,7 +1069,7 @@ static void gp_array_modifier_make_instances(GPENCIL_StorageList *stl, Object *o
}
/* compute transform for instance */
- BKE_gpencil_array_modifier_instance_tfm(mmd, elem_idx, mat);
+ BKE_gpencil_instance_modifier_instance_tfm(mmd, elem_idx, mat);
/* add object to cache */
newob = MEM_dupallocN(ob);
@@ -1096,8 +1096,8 @@ static void gp_array_modifier_make_instances(GPENCIL_StorageList *stl, Object *o
}
}
-/* create instances using array modifiers */
-void gpencil_array_modifiers(GPENCIL_StorageList *stl, Object *ob)
+/* create instances using instance modifiers */
+void gpencil_instance_modifiers(GPENCIL_StorageList *stl, Object *ob)
{
if ((ob) && (ob->data)) {
bGPdata *gpd = ob->data;
@@ -1110,14 +1110,14 @@ void gpencil_array_modifiers(GPENCIL_StorageList *stl, Object *ob)
if (((md->mode & eModifierMode_Realtime) && (stl->storage->is_render == false)) ||
((md->mode & eModifierMode_Render) && (stl->storage->is_render == true)))
{
- if (md->type == eModifierType_GpencilArray) {
- GpencilArrayModifierData *mmd = (GpencilArrayModifierData *)md;
+ if (md->type == eModifierType_GpencilInstance) {
+ GpencilInstanceModifierData *mmd = (GpencilInstanceModifierData *)md;
/* Only add instances if the "Make Objects" flag is set
* FIXME: This is a workaround for z-ordering weirdness when all instances are in the same object
*/
- if (mmd->flag & GP_ARRAY_MAKE_OBJECTS) {
- gp_array_modifier_make_instances(stl, ob, mmd);
+ if (mmd->flag & GP_INSTANCE_MAKE_OBJECTS) {
+ gp_instance_modifier_make_instances(stl, ob, mmd);
}
}
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 64b45bf1a3a..d189b1afaa9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -524,11 +524,11 @@ static void GPENCIL_cache_populate(void *vedata, Object *ob)
/* add for drawing later */
gpencil_object_cache_add(stl->g_data->gp_object_cache, ob, false, &stl->g_data->gp_cache_used);
- /* generate instances as separate cache objects for array modifiers
+ /* generate instances as separate cache objects for instance modifiers
* with the "Make as Objects" option enabled
*/
if (!stl->storage->simplify_modif) {
- gpencil_array_modifiers(stl, ob);
+ gpencil_instance_modifiers(stl, ob);
}
}
/* draw current painting strokes */
@@ -633,9 +633,9 @@ static void gpencil_prepare_fast_drawing(GPENCIL_StorageList *stl, DefaultFrameb
static void gpencil_free_obj_list(GPENCIL_StorageList *stl)
{
- /* Clear temp objects created for display arrays only. These objects are created
+ /* Clear temp objects created for display instances only. These objects are created
* while the draw manager draw the scene, but only to hold the strokes data.
- * see: gp_array_modifier_make_instances()
+ * see: gp_instance_modifier_make_instances()
*
* the normal objects are not freed because they are not tagged as temp objects
*/
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 24876fda200..92ebddba4fe 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -393,7 +393,7 @@ struct GpencilBatchCache *gpencil_batch_cache_get(struct Object *ob, int cfra);
void DRW_gpencil_vfx_modifiers(struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata, struct tGPencilObjectCache *cache);
void DRW_gpencil_vfx_draw(struct GPENCIL_Data *vedata, struct tGPencilObjectCache *cache);
bool gpencil_object_use_vfx(struct Object *ob);
-void gpencil_array_modifiers(struct GPENCIL_StorageList *stl, struct Object *ob);
+void gpencil_instance_modifiers(struct GPENCIL_StorageList *stl, struct Object *ob);
/* depth of field */
int GPENCIL_depth_of_field_init(struct DrawEngineType *draw_engine_gpencil_type, struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata, struct Object *camera);
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 830d7124f16..836dbc7ffca 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1032,7 +1032,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case eModifierType_GpencilTint:
ICON_DRAW(ICON_COLOR);
break;
- case eModifierType_GpencilArray:
+ case eModifierType_GpencilInstance:
ICON_DRAW(ICON_MOD_ARRAY);
break;
case eModifierType_GpencilBuild:
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index e09fcc85052..1768f0c0caf 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -91,7 +91,7 @@ typedef enum ModifierType {
eModifierType_GpencilSubdiv = 55,
eModifierType_GpencilThick = 56,
eModifierType_GpencilTint = 57,
- eModifierType_GpencilArray = 58,
+ eModifierType_GpencilInstance = 58,
eModifierType_GpencilBuild = 59,
eModifierType_GpencilOpacity = 60,
eModifierType_GpencilColor = 61,
@@ -1752,7 +1752,7 @@ typedef enum eGpencilOpacity_Flag {
GP_OPACITY_INVERSE_VGROUP = (1 << 2),
} eGpencilOpacity_Flag;
-typedef struct GpencilArrayModifierData {
+typedef struct GpencilInstanceModifierData {
ModifierData modifier;
int count[3]; /* number of elements in array */
int flag; /* several flags */
@@ -1767,15 +1767,15 @@ typedef struct GpencilArrayModifierData {
int pass_index; /* custom index for passes */
char layername[64]; /* layer name */
-} GpencilArrayModifierData;
-
-typedef enum eGpencilArray_Flag {
- GP_ARRAY_RANDOM_SIZE = (1 << 0),
- GP_ARRAY_RANDOM_ROT = (1 << 1),
- GP_ARRAY_INVERSE_LAYER = (1 << 2),
- GP_ARRAY_INVERSE_PASS = (1 << 3),
- GP_ARRAY_MAKE_OBJECTS = (1 << 4),
-} eGpencilArray_Flag;
+} GpencilInstanceModifierData;
+
+typedef enum eGpencilInstance_Flag {
+ GP_INSTANCE_RANDOM_SIZE = (1 << 0),
+ GP_INSTANCE_RANDOM_ROT = (1 << 1),
+ GP_INSTANCE_INVERSE_LAYER = (1 << 2),
+ GP_INSTANCE_INVERSE_PASS = (1 << 3),
+ GP_INSTANCE_MAKE_OBJECTS = (1 << 4),
+} eGpencilInstance_Flag;
typedef struct GpencilBuildModifierData {
ModifierData modifier;
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index c5deb09282b..6aae524ebb3 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -600,7 +600,7 @@ extern StructRNA RNA_GpencilSimplify;
extern StructRNA RNA_GpencilThickModifier;
extern StructRNA RNA_GpencilTintModifier;
extern StructRNA RNA_GpencilColorModifier;
-extern StructRNA RNA_GpencilArrayModifier;
+extern StructRNA RNA_GpencilInstanceModifier;
extern StructRNA RNA_GpencilDupliModifier;
extern StructRNA RNA_GpencilOpacityModifier;
extern StructRNA RNA_GpencilLatticeModifier;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index aff36bc349e..9815a4c4e3c 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -124,7 +124,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
/* Grease Pencil Modifiers */
{0, "", 0, N_("Generate"), "" },
- {eModifierType_GpencilArray, "GP_ARRAY", ICON_MOD_ARR
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list