Rename Scene's embeded collections from "Master Collection" to "Scene Collection"
Note that this name is essentially never used anywhere, besides as 'information' mostly accessible from python console. Those embedded IDs are not in Main, so they are not accessible by name ever, and mostly unusable from animation perspective (either drivers or fcurves). Therefore, no breakage is expected in user scripts or addons, nor when loading in older versions of Blender. Reviewed By: dfelinto, brecht Differential Revision: https://developer.blender.org/D11812
This commit is contained in:
parent
7af40ccf5f
commit
b05ba2ef0e
|
@ -39,7 +39,7 @@ extern "C" {
|
|||
|
||||
/* Blender file format version. */
|
||||
#define BLENDER_FILE_VERSION BLENDER_VERSION
|
||||
#define BLENDER_FILE_SUBVERSION 7
|
||||
#define BLENDER_FILE_SUBVERSION 8
|
||||
|
||||
/* Minimum Blender version that supports reading file written with the current
|
||||
* version. Older Blender versions will test this and show a warning if the file
|
||||
|
|
|
@ -76,6 +76,7 @@ struct Collection *BKE_collection_duplicate(struct Main *bmain,
|
|||
|
||||
/* Master Collection for Scene */
|
||||
|
||||
#define BKE_SCENE_COLLECTION_NAME "Scene Collection"
|
||||
struct Collection *BKE_collection_master_add(void);
|
||||
|
||||
/* Collection Objects */
|
||||
|
|
|
@ -888,7 +888,7 @@ Collection *BKE_collection_master_add()
|
|||
{
|
||||
/* Not an actual datablock, but owned by scene. */
|
||||
Collection *master_collection = BKE_libblock_alloc(
|
||||
NULL, ID_GR, "Master Collection", LIB_ID_CREATE_NO_MAIN);
|
||||
NULL, ID_GR, BKE_SCENE_COLLECTION_NAME, LIB_ID_CREATE_NO_MAIN);
|
||||
master_collection->id.flag |= LIB_EMBEDDED_DATA;
|
||||
master_collection->flag |= COLLECTION_IS_MASTER;
|
||||
master_collection->color_tag = COLLECTION_COLOR_NONE;
|
||||
|
|
|
@ -28,12 +28,14 @@
|
|||
#include "DNA_anim_types.h"
|
||||
#include "DNA_armature_types.h"
|
||||
#include "DNA_brush_types.h"
|
||||
#include "DNA_collection_types.h"
|
||||
#include "DNA_genfile.h"
|
||||
#include "DNA_listBase.h"
|
||||
#include "DNA_modifier_types.h"
|
||||
#include "DNA_text_types.h"
|
||||
|
||||
#include "BKE_animsys.h"
|
||||
#include "BKE_collection.h"
|
||||
#include "BKE_fcurve_driver.h"
|
||||
#include "BKE_lib_id.h"
|
||||
#include "BKE_main.h"
|
||||
|
@ -468,6 +470,16 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
|||
}
|
||||
}
|
||||
|
||||
if (!MAIN_VERSION_ATLEAST(bmain, 300, 8)) {
|
||||
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
||||
if (scene->master_collection != NULL) {
|
||||
BLI_strncpy(scene->master_collection->id.name + 2,
|
||||
BKE_SCENE_COLLECTION_NAME,
|
||||
sizeof(scene->master_collection->id.name) - 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Versioning code until next subversion bump goes here.
|
||||
*
|
||||
|
|
|
@ -7962,10 +7962,10 @@ void RNA_def_scene(BlenderRNA *brna)
|
|||
RNA_def_property_pointer_sdna(prop, NULL, "master_collection");
|
||||
RNA_def_property_struct_type(prop, "Collection");
|
||||
RNA_def_property_clear_flag(prop, PROP_PTR_NO_OWNERSHIP);
|
||||
RNA_def_property_ui_text(
|
||||
prop,
|
||||
"Collection",
|
||||
"Scene master collection that objects and other collections in the scene");
|
||||
RNA_def_property_ui_text(prop,
|
||||
"Collection",
|
||||
"Scene root collection that owns all the objects and other collections "
|
||||
"instantiated in the scene");
|
||||
|
||||
/* Scene Display */
|
||||
prop = RNA_def_property(srna, "display", PROP_POINTER, PROP_NONE);
|
||||
|
|
Loading…
Reference in New Issue