[Bf-blender-cvs] [7082d8a0fc5] temp-greasepencil-object-stacksplit: More compiler error fix
Antonio Vazquez
noreply at git.blender.org
Mon Jun 18 17:12:19 CEST 2018
Commit: 7082d8a0fc5e30db903de931f4d48c79094fe82e
Author: Antonio Vazquez
Date: Mon Jun 18 17:12:07 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB7082d8a0fc5e30db903de931f4d48c79094fe82e
More compiler error fix
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 10d26be655d..d0be698073b 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -81,6 +81,9 @@ typedef enum {
/* Grease pencil modifiers */
eGreasePencilModifierTypeFlag_GpencilMod = (1 << 7),
+
+ /* can't be added manually by user */
+ eGreasePencilModifierTypeFlag_NoUserAdd = (1 << 8),
} GreasePencilModifierTypeFlag;
/* IMPORTANT! Keep ObjectWalkFunc and IDWalkFunc signatures compatible. */
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index cc9d397f9b4..58e36e26f4c 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -139,7 +139,7 @@ GreasePencilModifierData *ED_object_gpencil_modifier_add(ReportList *reports, Ma
/* Return true if the object has a modifier of type 'type' other than
* the modifier pointed to be 'exclude', otherwise returns false. */
-static bool object_has_gpencil_modifier(const Object *ob, const GreasePencilModifierData *exclude,
+static bool gpencil_object_has_modifier(const Object *ob, const GreasePencilModifierData *exclude,
GreasePencilModifierType type)
{
GreasePencilModifierData *md;
@@ -152,7 +152,7 @@ static bool object_has_gpencil_modifier(const Object *ob, const GreasePencilModi
return false;
}
-static bool object_modifier_remove(Main *bmain, Object *ob, GreasePencilModifierData *md,
+static bool gpencil_object_modifier_remove(Main *bmain, Object *ob, GreasePencilModifierData *md,
bool *r_sort_depsgraph)
{
/* It seems on rapid delete it is possible to
@@ -176,7 +176,7 @@ bool ED_object_gpencil_modifier_remove(ReportList *reports, Main *bmain, Object
bool sort_depsgraph = false;
bool ok;
- ok = object_modifier_remove(bmain, ob, md, &sort_depsgraph);
+ ok = gpencil_object_modifier_remove(bmain, ob, md, &sort_depsgraph);
if (!ok) {
BKE_reportf(reports, RPT_ERROR, "Modifier '%s' not in object '%s'", md->name, ob->id.name);
@@ -202,7 +202,7 @@ void ED_object_gpencil_modifier_clear(Main *bmain, Object *ob)
next_md = md->next;
- object_modifier_remove(bmain, ob, md, &sort_depsgraph);
+ gpencil_object_modifier_remove(bmain, ob, md, &sort_depsgraph);
md = next_md;
}
@@ -231,7 +231,7 @@ int ED_object_gpencil_modifier_move_down(ReportList *reports, Object *ob, Grease
return 1;
}
-static int modifier_apply_obdata(ReportList *reports, Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *ob, GreasePencilModifierData *md)
+static int gpencil_modifier_apply_obdata(ReportList *reports, Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *ob, GreasePencilModifierData *md)
{
const GreasePencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
@@ -294,7 +294,7 @@ int ED_object_gpencil_modifier_apply(
prev_mode = md->mode;
md->mode |= eModifierMode_Realtime;
- if (!modifier_apply_obdata(reports, bmain, depsgraph, scene, ob, md)) {
+ if (!gpencil_modifier_apply_obdata(reports, bmain, depsgraph, scene, ob, md)) {
md->mode = prev_mode;
return 0;
}
@@ -321,7 +321,7 @@ int ED_object_gpencil_modifier_copy(ReportList *UNUSED(reports), Object *ob, Gre
/************************ add modifier operator *********************/
-static int modifier_add_exec(bContext *C, wmOperator *op)
+static int gpencil_modifier_add_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
@@ -336,7 +336,7 @@ static int modifier_add_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-static const EnumPropertyItem *modifier_add_itemf(
+static const EnumPropertyItem *gpencil_modifier_add_itemf(
bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
{
Object *ob = ED_object_active_context(C);
@@ -392,7 +392,7 @@ void OBJECT_OT_gpencil_modifier_add(wmOperatorType *ot)
/* api callbacks */
ot->invoke = WM_menu_invoke;
- ot->exec = modifier_add_exec;
+ ot->exec = gpencil_modifier_add_exec;
ot->poll = ED_operator_object_active_editable;
/* flags */
@@ -400,13 +400,13 @@ void OBJECT_OT_gpencil_modifier_add(wmOperatorType *ot)
/* properties */
prop = RNA_def_enum(ot->srna, "type", rna_enum_object_modifier_type_items, eModifierType_Subsurf, "Type", "");
- RNA_def_enum_funcs(prop, modifier_add_itemf);
+ RNA_def_enum_funcs(prop, gpencil_modifier_add_itemf);
ot->prop = prop;
}
/************************ generic functions for operators using mod names and data context *********************/
-int edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag)
+int gpencil_edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag)
{
PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", rna_type);
Object *ob = (ptr.id.data) ? ptr.id.data : ED_object_active_context(C);
@@ -428,17 +428,17 @@ int edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag
return 1;
}
-int edit_modifier_poll(bContext *C)
+int gpencil_edit_modifier_poll(bContext *C)
{
- return edit_modifier_poll_generic(C, &RNA_GreasePencilModifier, 0);
+ return gpencil_edit_modifier_poll_generic(C, &RNA_GreasePencilModifier, 0);
}
-void edit_modifier_properties(wmOperatorType *ot)
+void gpencil_edit_modifier_properties(wmOperatorType *ot)
{
RNA_def_string(ot->srna, "modifier", NULL, MAX_NAME, "Modifier", "Name of the modifier to edit");
}
-int edit_modifier_invoke_properties(bContext *C, wmOperator *op)
+int gpencil_edit_modifier_invoke_properties(bContext *C, wmOperator *op)
{
GreasePencilModifierData *md;
@@ -473,7 +473,7 @@ static GreasePencilModifierData *gpencil_edit_modifier_property_get(wmOperator *
/************************ remove modifier operator *********************/
-static int modifier_remove_exec(bContext *C, wmOperator *op)
+static int gpencil_modifier_remove_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
@@ -489,10 +489,10 @@ static int modifier_remove_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-static int modifier_remove_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+static int gpencil_modifier_remove_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
- if (edit_modifier_invoke_properties(C, op))
- return modifier_remove_exec(C, op);
+ if (gpencil_edit_modifier_invoke_properties(C, op))
+ return gpencil_modifier_remove_exec(C, op);
else
return OPERATOR_CANCELLED;
}
@@ -503,18 +503,18 @@ void OBJECT_OT_gpencil_modifier_remove(wmOperatorType *ot)
ot->description = "Remove a modifier from the active grease pencil object";
ot->idname = "OBJECT_OT_gpencil_modifier_remove";
- ot->invoke = modifier_remove_invoke;
- ot->exec = modifier_remove_exec;
- ot->poll = edit_modifier_poll;
+ ot->invoke = gpencil_modifier_remove_invoke;
+ ot->exec = gpencil_modifier_remove_exec;
+ ot->poll = gpencil_edit_modifier_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
- edit_modifier_properties(ot);
+ gpencil_edit_modifier_properties(ot);
}
/************************ move up modifier operator *********************/
-static int modifier_move_up_exec(bContext *C, wmOperator *op)
+static int gpencil_modifier_move_up_exec(bContext *C, wmOperator *op)
{
Object *ob = ED_object_active_context(C);
GreasePencilModifierData *md = gpencil_edit_modifier_property_get(op, ob, 0);
@@ -528,10 +528,10 @@ static int modifier_move_up_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-static int modifier_move_up_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+static int gpencil_modifier_move_up_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
- if (edit_modifier_invoke_properties(C, op))
- return modifier_move_up_exec(C, op);
+ if (gpencil_edit_modifier_invoke_properties(C, op))
+ return gpencil_modifier_move_up_exec(C, op);
else
return OPERATOR_CANCELLED;
}
@@ -542,18 +542,18 @@ void OBJECT_OT_gpencil_modifier_move_up(wmOperatorType *ot)
ot->description = "Move modifier up in the stack";
ot->idname = "OBJECT_OT_modifier_move_up";
- ot->invoke = modifier_move_up_invoke;
- ot->exec = modifier_move_up_exec;
- ot->poll = edit_modifier_poll;
+ ot->invoke = gpencil_modifier_move_up_invoke;
+ ot->exec = gpencil_modifier_move_up_exec;
+ ot->poll = gpencil_edit_modifier_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
- edit_modifier_properties(ot);
+ gpencil_edit_modifier_properties(ot);
}
/************************ move down modifier operator *********************/
-static int modifier_move_down_exec(bContext *C, wmOperator *op)
+static int gpencil_modifier_move_down_exec(bContext *C, wmOperator *op)
{
Object *ob = ED_object_active_context(C);
GreasePencilModifierData *md = gpencil_edit_modifier_property_get(op, ob, 0);
@@ -567,10 +567,10 @@ static int modifier_move_down_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-static int modifier_move_down_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+static int gpencil_modifier_move_down_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
- if (edit_modifier_invoke_properties(C, op))
- return modifier_move_down_exec(C, op);
+ if (gpencil_edit_modifier_invoke_properties(C, op))
+ return gpencil_modifier_move_down_exec(C, op);
else
return OPERATOR_CANCELLED;
}
@@ -581,18 +581,18 @@ void OBJECT_OT_gpencil_modifier_move_down(wmOperatorType *ot)
ot->description = "Move modifier down in the stack";
ot->idname = "OBJECT_OT_modifier_move_down";
- ot->invoke = modifier_move_down_invoke;
- ot->exec = modifier_move_down_exec;
- ot->poll = edit_modifier_poll;
+ ot->invoke = gpencil_modifier_move_down_invoke;
+ ot->exec = gpencil_modifier_move_down_exec;
+ ot->poll = gpencil_edit_modifier_poll;
/* flags */
ot->flag = OPTY
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list