Commit: e900f6ed14508f9872adae4fbd3d2bd6f3132dff Author: Bastien Montagne Date: Thu Oct 8 16:11:38 2020 +0200 Branches: master https://developer.blender.org/rBe900f6ed14508f9872adae4fbd3d2bd6f3132dff
Add DNA defaults for Collection. =================================================================== A source/blender/makesdna/DNA_collection_defaults.h M source/blender/makesdna/intern/dna_defaults.c =================================================================== diff --git a/source/blender/makesdna/DNA_collection_defaults.h b/source/blender/makesdna/DNA_collection_defaults.h new file mode 100644 index 00000000000..079c24b04db --- /dev/null +++ b/source/blender/makesdna/DNA_collection_defaults.h @@ -0,0 +1,37 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** \file + * \ingroup DNA + */ + +#pragma once + +/* Struct members on own line. */ +/* clang-format off */ + +/* -------------------------------------------------------------------- */ +/** \name Collection Struct + * \{ */ + +#define _DNA_DEFAULT_Collection \ + { \ + .color_tag = COLLECTION_COLOR_NONE, \ + } + +/** \} */ + +/* clang-format on */ diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index 8f64797d441..ce6bc82e326 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -87,6 +87,7 @@ #include "DNA_cachefile_types.h" #include "DNA_camera_types.h" #include "DNA_cloth_types.h" +#include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_hair_types.h" #include "DNA_image_types.h" @@ -113,6 +114,7 @@ #include "DNA_brush_defaults.h" #include "DNA_cachefile_defaults.h" #include "DNA_camera_defaults.h" +#include "DNA_collection_defaults.h" #include "DNA_curve_defaults.h" #include "DNA_hair_defaults.h" #include "DNA_image_defaults.h" @@ -148,6 +150,9 @@ SDNA_DEFAULT_DECL_STRUCT(CacheFile); /* DNA_camera_defaults.h */ SDNA_DEFAULT_DECL_STRUCT(Camera); +/* DNA_collection_defaults.h */ +SDNA_DEFAULT_DECL_STRUCT(Collection); + /* DNA_curve_defaults.h */ SDNA_DEFAULT_DECL_STRUCT(Curve); @@ -306,6 +311,9 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = { SDNA_DEFAULT_DECL_EX(CameraDOFSettings, Camera.dof), SDNA_DEFAULT_DECL_EX(CameraStereoSettings, Camera.stereo), + /* DNA_collection_defaults.h */ + SDNA_DEFAULT_DECL(Collection), + /* DNA_curve_defaults.h */ SDNA_DEFAULT_DECL(Curve), _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs