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:
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/CMakeLists.txt2
-rw-r--r--source/blender/editors/object/object_add.c2
-rw-r--r--source/blender/editors/object/object_collection.c (renamed from source/blender/editors/object/object_group.c)4
-rw-r--r--source/blender/editors/object/object_edit.c2
-rw-r--r--source/blender/editors/object/object_relations.c2
-rw-r--r--source/blender/editors/object/object_select.c2
-rw-r--r--source/blender/editors/object/object_transform.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 739975a6278..17359934c6e 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -48,10 +48,10 @@ set(SRC
object_add.c
object_bake.c
object_bake_api.c
+ object_collection.c
object_constraint.c
object_edit.c
object_facemap_ops.c
- object_group.c
object_hook.c
object_modes.c
object_modifier.c
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 7e9390e893a..80ce7f26905 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -35,8 +35,8 @@
#include "DNA_anim_types.h"
#include "DNA_camera_types.h"
+#include "DNA_collection_types.h"
#include "DNA_curve_types.h"
-#include "DNA_group_types.h"
#include "DNA_lamp_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_collection.c
index 72c5fde2955..8386b1fc520 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_collection.c
@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/object/object_group.c
+/** \file blender/editors/object/object_collection.c
* \ingroup edobj
*/
@@ -35,7 +35,7 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
-#include "DNA_group_types.h"
+#include "DNA_collection_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 5d0d715ea15..58ecd7fb472 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -46,9 +46,9 @@
#include "BLT_translation.h"
#include "DNA_armature_types.h"
+#include "DNA_collection_types.h"
#include "DNA_curve_types.h"
#include "DNA_gpencil_types.h"
-#include "DNA_group_types.h"
#include "DNA_material_types.h"
#include "DNA_meta_types.h"
#include "DNA_scene_types.h"
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 7eca34c505f..9279a755b56 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -37,8 +37,8 @@
#include "DNA_anim_types.h"
#include "DNA_armature_types.h"
#include "DNA_mesh_types.h"
+#include "DNA_collection_types.h"
#include "DNA_constraint_types.h"
-#include "DNA_group_types.h"
#include "DNA_lamp_types.h"
#include "DNA_lattice_types.h"
#include "DNA_material_types.h"
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 3ebec65da69..fc4934fe4b3 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -34,7 +34,7 @@
#include <string.h>
#include "DNA_anim_types.h"
-#include "DNA_group_types.h"
+#include "DNA_collection_types.h"
#include "DNA_material_types.h"
#include "DNA_modifier_types.h"
#include "DNA_scene_types.h"
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 432a27da1e7..b105102fa6c 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -39,7 +39,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_gpencil_types.h"
-#include "DNA_group_types.h"
+#include "DNA_collection_types.h"
#include "DNA_lattice_types.h"
#include "BLI_math.h"