[Bf-blender-cvs] [727f6d70fa4] greasepencil-object: Silence warning + cleanup

[Dalai Felinto]

Commit: 727f6d70fa4a88448c1b89813160f5005f429888
Author: Dalai Felinto
Date:   Fri Jun 22 09:05:27 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB727f6d70fa4a88448c1b89813160f5005f429888

Silence warning + cleanup

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

M       source/blender/blenkernel/BKE_object.h
M       source/blender/editors/interface/interface_templates.c
M       source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/blenkernel/BKE_object.h 
b/source/blender/blenkernel/BKE_object.h
index 46b6bd29ac5..911933f3690 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -37,6 +37,7 @@ extern "C" {
 
 struct Base;
 struct Depsgraph;
+struct GpencilModifierData;
 struct Scene;
 struct ViewLayer;
 struct ID;
diff --git a/source/blender/editors/interface/interface_templates.c 
b/source/blender/editors/interface/interface_templates.c
index 0796ebdc4f4..3a6dada66e7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1533,7 +1533,7 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext 
*C, PointerRNA *ptr)
        return NULL;
 }
 
-static uiLayout *gpencil_draw_modifier(uiLayout *layout, Scene *scene, Object 
*ob,
+static uiLayout *gpencil_draw_modifier(uiLayout *layout, Scene *UNSED(scene), 
Object *ob,
                                                                           
GpencilModifierData *md)
 {
        const GpencilModifierTypeInfo *mti = 
BKE_gpencil_modifierType_getInfo(md->type);
diff --git a/source/blender/editors/object/object_modifier.c 
b/source/blender/editors/object/object_modifier.c
index 6c27403270a..2a0365e4821 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -782,6 +782,7 @@ static const EnumPropertyItem *modifier_add_itemf(
 
        for (a = 0; rna_enum_object_modifier_type_items[a].identifier; a++) {
                md_item = &rna_enum_object_modifier_type_items[a];
+
                if (md_item->identifier[0]) {
                        mti = modifierType_getInfo(md_item->value);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs