diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 16:32:50 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:25:50 +0300 |
commit | 42f7767dab56ce6cf26e490c3cb2c689b2b0d507 (patch) | |
tree | a1c9b4bb7bdd18488e9e325fc0d08c304bf305fe /source/blender/makesrna/intern | |
parent | 31278eb4bcc73f95b5032d65ababf32812074c5c (diff) |
Cleanup: rename files from group to collection to match contents.
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_collection.c (renamed from source/blender/makesrna/intern/rna_group.c) | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_layer.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_lightprobe.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_rigidbody.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index b98eb84eaae..a795b4c6cae 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -40,6 +40,7 @@ set(DEFSRC rna_cachefile.c rna_camera.c rna_cloth.c + rna_collection.c rna_color.c rna_constraint.c rna_context.c @@ -50,13 +51,12 @@ set(DEFSRC rna_fluidsim.c rna_gpencil.c rna_gpencil_modifier.c - rna_shader_fx.c - rna_group.c rna_image.c rna_key.c rna_lamp.c rna_lattice.c rna_layer.c + rna_lightprobe.c rna_linestyle.c rna_main.c rna_mask.c @@ -73,7 +73,6 @@ set(DEFSRC rna_palette.c rna_particle.c rna_pose.c - rna_lightprobe.c rna_render.c rna_rigidbody.c rna_rna.c @@ -81,6 +80,7 @@ set(DEFSRC rna_screen.c rna_sculpt_paint.c rna_sequencer.c + rna_shader_fx.c rna_smoke.c rna_sound.c rna_space.c diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index b0713987e16..e5644d10add 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3396,6 +3396,7 @@ static RNAProcessItem PROCESS_ITEMS[] = { {"rna_cachefile.c", NULL, RNA_def_cachefile}, {"rna_camera.c", "rna_camera_api.c", RNA_def_camera}, {"rna_cloth.c", NULL, RNA_def_cloth}, + {"rna_collection.c", NULL, RNA_def_collections}, {"rna_color.c", NULL, RNA_def_color}, {"rna_constraint.c", NULL, RNA_def_constraint}, {"rna_context.c", NULL, RNA_def_context}, @@ -3404,7 +3405,6 @@ static RNAProcessItem PROCESS_ITEMS[] = { {"rna_fcurve.c", "rna_fcurve_api.c", RNA_def_fcurve}, {"rna_fluidsim.c", NULL, RNA_def_fluidsim}, {"rna_gpencil.c", NULL, RNA_def_gpencil}, - {"rna_group.c", NULL, RNA_def_collections}, {"rna_image.c", "rna_image_api.c", RNA_def_image}, {"rna_key.c", NULL, RNA_def_key}, {"rna_lamp.c", NULL, RNA_def_light}, diff --git a/source/blender/makesrna/intern/rna_group.c b/source/blender/makesrna/intern/rna_collection.c index 7797de9ad4b..1262ae05390 100644 --- a/source/blender/makesrna/intern/rna_group.c +++ b/source/blender/makesrna/intern/rna_collection.c @@ -20,13 +20,13 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/makesrna/intern/rna_group.c +/** \file blender/makesrna/intern/rna_collection.c * \ingroup RNA */ #include <stdlib.h> -#include "DNA_group_types.h" +#include "DNA_collection_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index d425534fe53..df86a45b1a9 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -53,7 +53,7 @@ # include "BPY_extern.h" #endif -#include "DNA_group_types.h" +#include "DNA_collection_types.h" #include "DNA_object_types.h" #include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c index f54c01fab8e..cae06b5aa89 100644 --- a/source/blender/makesrna/intern/rna_lightprobe.c +++ b/source/blender/makesrna/intern/rna_lightprobe.c @@ -42,8 +42,8 @@ #include "BKE_main.h" #include "DEG_depsgraph.h" +#include "DNA_collection_types.h" #include "DNA_object_types.h" -#include "DNA_group_types.h" #include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 9fd9a04ae25..6e68eb51ff8 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -99,7 +99,7 @@ #include "DNA_lightprobe_types.h" #include "DNA_text_types.h" #include "DNA_texture_types.h" -#include "DNA_group_types.h" +#include "DNA_collection_types.h" #include "DNA_brush_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index cf5b3aff571..ec5daa69d6d 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -29,8 +29,8 @@ #include "DNA_action_types.h" #include "DNA_brush_types.h" +#include "DNA_collection_types.h" #include "DNA_customdata_types.h" -#include "DNA_group_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_object_force_types.h" diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 899439e1a02..4a36e2d00b7 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -33,7 +33,7 @@ #include "rna_internal.h" -#include "DNA_group_types.h" +#include "DNA_collection_types.h" #include "DNA_object_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 664271075e0..356ffe6a17b 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include "DNA_brush_types.h" -#include "DNA_group_types.h" +#include "DNA_collection_types.h" #include "DNA_modifier_types.h" #include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" |