Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-29 16:32:50 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-29 17:25:50 +0300
commit42f7767dab56ce6cf26e490c3cb2c689b2b0d507 (patch)
treea1c9b4bb7bdd18488e9e325fc0d08c304bf305fe /source/blender/makesdna
parent31278eb4bcc73f95b5032d65ababf32812074c5c (diff)
Cleanup: rename files from group to collection to match contents.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_collection_types.h (renamed from source/blender/makesdna/DNA_group_types.h)2
-rw-r--r--source/blender/makesdna/DNA_scene_types.h2
-rw-r--r--source/blender/makesdna/intern/makesdna.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_collection_types.h
index b5208a81510..b9ee473a361 100644
--- a/source/blender/makesdna/DNA_group_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file DNA_group_types.h
+/** \file DNA_collection_types.h
* \ingroup DNA
*
* \brief Object groups, one object can be in many groups at once.
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 6425871b7dd..ed8e71e86f2 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -47,7 +47,7 @@ extern "C" {
#include "DNA_ID.h"
#include "DNA_freestyle_types.h"
#include "DNA_gpu_types.h"
-#include "DNA_group_types.h"
+#include "DNA_collection_types.h"
#include "DNA_layer_types.h"
#include "DNA_material_types.h"
#include "DNA_userdef_types.h"
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 7b27ec05865..2d05e2621fa 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -101,7 +101,7 @@ static const char *includefiles[] = {
"DNA_effect_types.h",
"DNA_outliner_types.h",
"DNA_sound_types.h",
- "DNA_group_types.h",
+ "DNA_collection_types.h",
"DNA_armature_types.h",
"DNA_action_types.h",
"DNA_constraint_types.h",
@@ -1327,7 +1327,7 @@ int main(int argc, char **argv)
#include "DNA_effect_types.h"
#include "DNA_outliner_types.h"
#include "DNA_sound_types.h"
-#include "DNA_group_types.h"
+#include "DNA_collection_types.h"
#include "DNA_armature_types.h"
#include "DNA_action_types.h"
#include "DNA_constraint_types.h"