[Bf-blender-cvs] [5f7a257a506] temp-greasepencil-object-stacksplit: Cleanup: Silent compiler warnings and remove unused code
Antonio Vazquez
noreply at git.blender.org
Tue Jun 19 11:21:10 CEST 2018
Commit: 5f7a257a50652edf7a8b99ba30cccb045e65f488
Author: Antonio Vazquez
Date: Tue Jun 19 11:20:46 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB5f7a257a50652edf7a8b99ba30cccb045e65f488
Cleanup: Silent compiler warnings and remove unused code
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/object/object_gpencil_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 43d796639df..5c686982f63 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -89,7 +89,7 @@ typedef enum {
/* IMPORTANT! Keep ObjectWalkFunc and IDWalkFunc signatures compatible. */
typedef void(*GreasePencilObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin, int cb_flag);
typedef void(*GreasePencilIDWalkFunc)(void *userData, struct Object *ob, struct ID **idpoin, int cb_flag);
-typedef void(*GreasePencilTexWalkFunc)(void *userData, struct Object *ob, struct ModifierData *md, const char *propname);
+typedef void(*GreasePencilTexWalkFunc)(void *userData, struct Object *ob, struct GpencilModifierData *md, const char *propname);
typedef struct GpencilModifierTypeInfo {
/* The user visible name for this modifier */
@@ -247,7 +247,5 @@ struct GpencilModifierData *BKE_gpencil_modifiers_findByType(struct Object *ob,
struct GpencilModifierData *BKE_gpencil_modifiers_findByName(struct Object *ob, const char *name);
void BKE_gpencil_modifier_copyData_generic(const struct GpencilModifierData *md_src, struct GpencilModifierData *md_dst);
void BKE_gpencil_modifier_copyData(struct GpencilModifierData *md, struct GpencilModifierData *target);
-int BKE_gpencil_modifiers_getCageIndex(struct Scene *scene, struct Object *ob,
- int *r_lastPossibleCageIndex, bool is_virtual);
#endif /* __BKE_GREASEPENCIL_H__ */
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 6bc68cfd3c1..6891ef99c7c 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -602,38 +602,6 @@ GpencilModifierData *BKE_gpencil_modifiers_findByName(Object *ob, const char *na
return BLI_findstring(&(ob->greasepencil_modifiers), name, offsetof(GpencilModifierData, name));
}
-/* used for buttons, to find out if the 'draw deformed in editmode' option is
-* there
-*/
-int BKE_gpencil_modifiers_getCageIndex(struct Scene *scene, Object *ob, int *r_lastPossibleCageIndex, bool is_virtual)
-{
- GpencilModifierData *md = ob->greasepencil_modifiers.first;
- int i, cageIndex = -1;
-
- if (r_lastPossibleCageIndex) {
- /* ensure the value is initialized */
- *r_lastPossibleCageIndex = -1;
- }
-
- /* Find the last modifier acting on the cage. */
- for (i = 0; md; i++, md = md->next) {
- const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
- bool supports_mapping;
-
- md->scene = scene;
-
- if (mti->isDisabled && mti->isDisabled(md, 0)) continue;
- if (!(mti->flags & eGpencilModifierTypeFlag_SupportsEditmode)) continue;
-
- if (!(md->mode & eGpencilModifierMode_Realtime)) continue;
- if (!(md->mode & eGpencilModifierMode_Editmode)) continue;
-
-
- }
-
- return cageIndex;
-}
-
/* helper function for per-instance positioning */
void BKE_gpencil_instance_modifier_instance_tfm(InstanceGpencilModifierData *mmd, const int elem_idx[3], float r_mat[4][4])
{
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 29b6fde0d45..ba3342aa29c 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1533,9 +1533,8 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr)
return NULL;
}
-static uiLayout *gpencil_draw_modifier(
- uiLayout *layout, Scene *scene, Object *ob,
- GpencilModifierData *md, int index, int cageIndex, int lastCageIndex)
+static uiLayout *gpencil_draw_modifier(uiLayout *layout, Scene *scene, Object *ob,
+ GpencilModifierData *md)
{
const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
PointerRNA ptr;
@@ -1630,8 +1629,8 @@ uiLayout *uiTemplateGpencilModifier(uiLayout *layout, bContext *C, PointerRNA *p
Scene *scene = CTX_data_scene(C);
Object *ob;
GpencilModifierData *md, *vmd;
- int i, lastCageIndex, cageIndex;
-
+ int i;
+
/* verify we have valid data */
if (!RNA_struct_is_a(ptr->type, &RNA_GpencilModifier)) {
RNA_warning("Expected modifier on object");
@@ -1649,12 +1648,10 @@ uiLayout *uiTemplateGpencilModifier(uiLayout *layout, bContext *C, PointerRNA *p
UI_block_lock_set(uiLayoutGetBlock(layout), (ob && ID_IS_LINKED(ob)), ERROR_LIBDATA_MESSAGE);
/* find modifier and draw it */
- cageIndex = BKE_gpencil_modifiers_getCageIndex(scene, ob, &lastCageIndex, 0);
-
vmd = ob->greasepencil_modifiers.first;
for (i = 0; vmd; i++, vmd = vmd->next) {
if (md == vmd)
- return gpencil_draw_modifier(layout, scene, ob, md, i, cageIndex, lastCageIndex);
+ return gpencil_draw_modifier(layout, scene, ob, md);
}
return NULL;
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index 813151b6cb4..8a3a2d5b3fb 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -34,48 +34,22 @@
#include "MEM_guardedalloc.h"
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_gpencil_modifier_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_object_force_types.h"
+#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "BLI_bitmap.h"
#include "BLI_math.h"
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
-#include "BLI_path_util.h"
#include "BLI_utildefines.h"
-#include "BKE_animsys.h"
-#include "BKE_curve.h"
#include "BKE_context.h"
-#include "BKE_displist.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_effect.h"
-#include "BKE_global.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
#include "BKE_main.h"
-#include "BKE_mesh.h"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_runtime.h"
#include "BKE_gpencil_modifier.h"
-#include "BKE_multires.h"
#include "BKE_report.h"
#include "BKE_object.h"
-#include "BKE_object_deform.h"
-#include "BKE_ocean.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_softbody.h"
-#include "BKE_editmesh.h"
#include "BKE_gpencil.h"
#include "DEG_depsgraph.h"
@@ -86,10 +60,8 @@
#include "RNA_define.h"
#include "RNA_enum_types.h"
-#include "ED_armature.h"
#include "ED_object.h"
#include "ED_screen.h"
-#include "ED_mesh.h"
#include "WM_api.h"
#include "WM_types.h"
@@ -98,9 +70,9 @@
/******************************** API ****************************/
-GpencilModifierData *ED_object_gpencil_modifier_add(ReportList *reports, Main *bmain, Scene *scene, Object *ob, const char *name, int type)
+GpencilModifierData *ED_object_gpencil_modifier_add(ReportList *reports, Main *bmain, Scene *UNUSED(scene), Object *ob, const char *name, int type)
{
- GpencilModifierData *md = NULL, *new_md = NULL;
+ GpencilModifierData *new_md = NULL;
const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(type);
if (ob->type != OB_GPENCIL) {
@@ -153,7 +125,7 @@ static bool gpencil_object_has_modifier(const Object *ob, const GpencilModifierD
}
static bool gpencil_object_modifier_remove(Main *bmain, Object *ob, GpencilModifierData *md,
- bool *r_sort_depsgraph)
+ bool *UNUSED(r_sort_depsgraph))
{
/* It seems on rapid delete it is possible to
* get called twice on same modifier, so make
@@ -211,7 +183,7 @@ void ED_object_gpencil_modifier_clear(Main *bmain, Object *ob)
DEG_relations_tag_update(bmain);
}
-int ED_object_gpencil_modifier_move_up(ReportList *reports, Object *ob, GpencilModifierData *md)
+int ED_object_gpencil_modifier_move_up(ReportList *UNUSED(reports), Object *ob, GpencilModifierData *md)
{
if (md->prev) {
BLI_remlink(&ob->greasepencil_modifiers, md);
@@ -221,7 +193,7 @@ int ED_object_gpencil_modifier_move_up(ReportList *reports, Object *ob, GpencilM
return 1;
}
-int ED_object_gpencil_modifier_move_down(ReportList *reports, Object *ob, GpencilModifierData *md)
+int ED_object_gpencil_modifier_move_down(ReportList *UNUSED(reports), Object *ob, GpencilModifierData *md)
{
if (md->next) {
BLI_remlink(&ob->greasepencil_modifiers, md);
@@ -263,7 +235,7 @@ static int gpencil_modifier_apply_obdata(ReportList *reports, Main *bmain, Depsg
int ED_object_gpencil_modifier_apply(
Main *bmain, ReportList *reports, Depsgraph *depsgraph,
- Scene *scene, Object *ob, GpencilModifierData *md, int mode)
+ Scene *scene, Object *ob, GpencilModifierData *md, int UNUSED(mode))
{
if (ob->type == OB_GPENCIL) {
@@ -387,7 +359,7 @@ void OBJECT_OT_gpencil_modifier_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- prop = RNA_def_enum(ot->srna, "type", rna_enum_object_modifier_type_items, eModifierType_Subsurf, "Type", "");
+ prop = RNA_def_enum(ot->srna, "type", rna_enum_object_modifier_type_items, eGpencilModifierType_Thick, "Type", "");
RNA_def_enum_funcs(prop, gpencil_modifier_add_itemf);
ot->prop = prop;
}
@@ -410,7 +382,7 @@ int gpencil_edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obt
if (ID_IS_STATIC_OVERRIDE(ob)) {
CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers comming from static override");
- return (((GpencilModifierData *)ptr.data)->flag & eModifierFlag_StaticOverride_Local) != 0;
+ return (((GpencilModifierData *)ptr.data)->flag & eGpencilModifierFlag_StaticOverride_Local) != 0;
}
return 1;
@@ -464,10 +436,8 @@ static GpencilModifierData *gpencil_edit_modifier_property_get(wmOperator *op, O
static int gpencil_modifier_remove_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
- ViewLayer *view_layer = CTX_data_view_layer(C);
Object *ob = ED_object_active_context(C);
GpencilModifierData *md = gpencil_edit_modifier_property_get(op, ob, 0);
- int mode_orig = ob->mode;
if (!md || !ED_object_gpencil_modifier_remove(op->reports, bmain, ob, md))
return OPER
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list