[Bf-blender-cvs] [e33a40ac166] temp-greasepencil-object-stacksplit: WIP: More compiler error fixing
Antonio Vazquez
noreply at git.blender.org
Sat Jun 16 13:47:41 CEST 2018
Commit: e33a40ac166dce60860477ad366aa8c3343938e1
Author: Antonio Vazquez
Date: Sat Jun 16 13:47:30 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBe33a40ac166dce60860477ad366aa8c3343938e1
WIP: More compiler error fixing
Enable lines disabled too
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
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_gpencilthick.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/makesrna/intern/rna_greasepencil_modifier.c
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 756118c96e2..0007cd0d71c 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -89,7 +89,7 @@ typedef enum {
/* For modifiers that use CD_PREVIEW_MCOL for preview. */
eGreasePencilModifierTypeFlag_UsesPreview = (1 << 9),
eGreasePencilModifierTypeFlag_AcceptsLattice = (1 << 10),
- /* Grease pencil modifiers (do not change mesh, only is placeholder) */
+ /* Grease pencil modifiers */
eGreasePencilModifierTypeFlag_GpencilMod = (1 << 11),
} GreasePencilModifierTypeFlag;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index a419a1ac5ff..4c13ab91bb7 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@ -50,6 +50,7 @@
#include "DEG_depsgraph_query.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index bf34e042849..e116c08f576 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -51,6 +51,7 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index 6a578362c76..31e70aeaedf 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -52,8 +52,8 @@
#include "MEM_guardedalloc.h"
-#include "MOD_modifiertypes.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
index e220f2b7c49..0627fa5656b 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
@@ -56,6 +56,7 @@
#include "DEG_depsgraph_build.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index 35399ace251..92d528f33d5 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@ -50,8 +50,8 @@
#include "MEM_guardedalloc.h"
-#include "MOD_modifiertypes.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 879264fde6d..5d1e6e501fc 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -51,6 +51,7 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index d9beb6d4355..b6057791de7 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@ -47,8 +47,8 @@
#include "DEG_depsgraph.h"
-#include "MOD_modifiertypes.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index bcd07353e6b..55f7a887456 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -47,8 +47,8 @@
#include "DEG_depsgraph.h"
-#include "MOD_modifiertypes.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
index 8dc4707bf83..83c0455c3ea 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
@@ -44,6 +44,7 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
index c27f0453283..21cf31ee617 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
@@ -42,8 +42,8 @@
#include "DEG_depsgraph.h"
-#include "MOD_modifiertypes.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
index bbb30182da7..e87a4238ef9 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
@@ -48,6 +48,7 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index f71af839315..a3c52275553 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@ -47,6 +47,7 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
index 8820c2515a8..34770d8b1fd 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
@@ -50,6 +50,7 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_util.h"
+#include "MOD_gpencil_modifiertypes.h"
static void initData(GreasePencilModifierData *md)
{
diff --git a/source/blender/makesrna/intern/rna_greasepencil_modifier.c b/source/blender/makesrna/intern/rna_greasepencil_modifier.c
index b23bc29a1d2..ed9c0b3e54f 100644
--- a/source/blender/makesrna/intern/rna_greasepencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_greasepencil_modifier.c
@@ -112,9 +112,8 @@ static const EnumPropertyItem rna_enum_gpencil_lockshift_items[] = {
#include "BKE_cachefile.h"
#include "BKE_context.h"
#include "BKE_library.h"
-#include "BKE_modifier.h"
+#include "BKE_gpencil_modifier.h"
#include "BKE_object.h"
-#include "BKE_particle.h"
#include "BKE_gpencil.h"
#include "DEG_depsgraph.h"
@@ -152,7 +151,7 @@ static StructRNA *rna_GreasePencilModifier_refine(struct PointerRNA *ptr)
case eGreasePencilModifierType_Offset:
return &RNA_OffsetGreasePencilModifier;
/* Default */
- case eModifierType_None:
+ case eGreasePencilModifierType_None:
case NUM_GREASEPENCIL_MODIFIER_TYPES:
return &RNA_GreasePencilModifier;
}
@@ -204,40 +203,22 @@ static void rna_GreasePencilModifier_dependency_update(Main *bmain, Scene *scene
/* Vertex Groups */
-#define RNA_MOD_VGROUP_NAME_SET(_type, _prop) \
+#define RNA_GP_MOD_VGROUP_NAME_SET(_type, _prop) \
static void rna_##_type##GreasePencilModifier_##_prop##_set(PointerRNA *ptr, const char *value) \
{ \
_type##GreasePencilModifierData *tmd = (_type##GreasePencilModifierData *)ptr->data; \
rna_object_vgroup_name_set(ptr, value, tmd->_prop, sizeof(tmd->_prop)); \
}
-RNA_MOD_VGROUP_NAME_SET(Noise, vgname);
-RNA_MOD_VGROUP_NAME_SET(Thick, vgname);
-RNA_MOD_VGROUP_NAME_SET(Opacity, vgname);
-RNA_MOD_VGROUP_NAME_SET(Lattice, vgname);
-RNA_MOD_VGROUP_NAME_SET(Smooth, vgname);
-RNA_MOD_VGROUP_NAME_SET(Hook, vgname);
-RNA_MOD_VGROUP_NAME_SET(Offset, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Noise, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Thick, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Opacity, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Lattice, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Smooth, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Hook, vgname);
+RNA_GP_MOD_VGROUP_NAME_SET(Offset, vgname);
-static void rna_ExplodeModifier_vgroup_get(PointerRNA *ptr, char *value)
-{
- ExplodeModifierData *emd = (ExplodeModifierData *)ptr->data;
- rna_object_vgroup_name_index_get(ptr, value, emd->vgroup);
-}
-
-static int rna_ExplodeModifier_vgroup_length(PointerRNA *ptr)
-{
- ExplodeModifierData *emd = (ExplodeModifierData *)ptr->data;
- return rna_object_vgroup_name_index_length(ptr, emd->vgroup);
-}
-
-static void rna_ExplodeModifier_vgroup_set(PointerRNA *ptr, const char *value)
-{
- ExplodeModifierData *emd = (ExplodeModifierData *)ptr->data;
- rna_object_vgroup_name_index_set(ptr, value, &emd->vgroup);
-}
-
-#undef RNA_MOD_VGROUP_NAME_SET
+#undef RNA_GP_MOD_VGROUP_NAME_SET
/* Objects */
@@ -253,28 +234,16 @@ static void greasepencil_modifier_object_set(Object *self, Object **o
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list