diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-10-15 17:44:39 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-10-15 17:44:39 +0300 |
| commit | d1b3439b80fd6e9a0caa653cd55c7a5def18b122 (patch) | |
| tree | c9d70e6ce66126d436bdb4e1d9307d7f487d064c /source/blender/makesdna/intern | |
| parent | bac91956ae9755722b81da4b6a0a394f9f77b2e1 (diff) | |
Cleanup: Use DNA defaults for grease pencil modifiers
This will make "Reset to Default Value" work properly for grease
pencil modifiers. See T80164 for more information.
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_defaults.c | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 1cb95ea3f83..2051335dd7e 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -144,6 +144,7 @@ set(SRC ../DNA_curve_defaults.h ../DNA_defaults.h ../DNA_fluid_defaults.h + ../DNA_gpencil_modifier_defaults.h ../DNA_hair_defaults.h ../DNA_image_defaults.h ../DNA_lattice_defaults.h diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index 9aeed636399..8c95a6d2a31 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -92,6 +92,7 @@ #include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_fluid_types.h" +#include "DNA_gpencil_modifier_types.h" #include "DNA_hair_types.h" #include "DNA_image_types.h" #include "DNA_key_types.h" @@ -122,6 +123,7 @@ #include "DNA_collection_defaults.h" #include "DNA_curve_defaults.h" #include "DNA_fluid_defaults.h" +#include "DNA_gpencil_modifier_defaults.h" #include "DNA_hair_defaults.h" #include "DNA_image_defaults.h" #include "DNA_lattice_defaults.h" @@ -289,6 +291,26 @@ SDNA_DEFAULT_DECL_STRUCT(WeightVGProximityModifierData); SDNA_DEFAULT_DECL_STRUCT(WeldModifierData); SDNA_DEFAULT_DECL_STRUCT(WireframeModifierData); +/* DNA_gpencil_modifier_defaults.h */ +SDNA_DEFAULT_DECL_STRUCT(ArmatureGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(ArrayGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(BuildGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(ColorGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(HookGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(LatticeGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(MirrorGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(MultiplyGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(NoiseGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(OffsetGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(OpacityGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(SimplifyGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(SmoothGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(SubdivGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(TextureGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(ThickGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(TimeGpencilModifierData); +SDNA_DEFAULT_DECL_STRUCT(TintGpencilModifierData); + #undef SDNA_DEFAULT_DECL_STRUCT /* Reuse existing definitions. */ @@ -488,6 +510,26 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = { SDNA_DEFAULT_DECL(WeightVGProximityModifierData), SDNA_DEFAULT_DECL(WeldModifierData), SDNA_DEFAULT_DECL(WireframeModifierData), + + /* DNA_gpencil_modifier_defaults.h */ + SDNA_DEFAULT_DECL(ArmatureGpencilModifierData), + SDNA_DEFAULT_DECL(ArrayGpencilModifierData), + SDNA_DEFAULT_DECL(BuildGpencilModifierData), + SDNA_DEFAULT_DECL(ColorGpencilModifierData), + SDNA_DEFAULT_DECL(HookGpencilModifierData), + SDNA_DEFAULT_DECL(LatticeGpencilModifierData), + SDNA_DEFAULT_DECL(MirrorGpencilModifierData), + SDNA_DEFAULT_DECL(MultiplyGpencilModifierData), + SDNA_DEFAULT_DECL(NoiseGpencilModifierData), + SDNA_DEFAULT_DECL(OffsetGpencilModifierData), + SDNA_DEFAULT_DECL(OpacityGpencilModifierData), + SDNA_DEFAULT_DECL(SimplifyGpencilModifierData), + SDNA_DEFAULT_DECL(SmoothGpencilModifierData), + SDNA_DEFAULT_DECL(SubdivGpencilModifierData), + SDNA_DEFAULT_DECL(TextureGpencilModifierData), + SDNA_DEFAULT_DECL(ThickGpencilModifierData), + SDNA_DEFAULT_DECL(TimeGpencilModifierData), + SDNA_DEFAULT_DECL(TintGpencilModifierData), }; #undef SDNA_DEFAULT_DECL #undef SDNA_DEFAULT_DECL_EX |