[Bf-blender-cvs] [4c14a7484cf] master: Cleanup: unused flag, spelling
Campbell Barton
noreply at git.blender.org
Tue Sep 3 16:56:40 CEST 2019
Commit: 4c14a7484cf1e79aaf1ff9f320fee53be4a9b60a
Author: Campbell Barton
Date: Wed Sep 4 00:23:58 2019 +1000
Branches: master
https://developer.blender.org/rB4c14a7484cf1e79aaf1ff9f320fee53be4a9b60a
Cleanup: unused flag, spelling
===================================================================
M source/blender/blenloader/intern/versioning_280.c
M source/blender/makesdna/DNA_object_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index a9f369908e7..454f1921586 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3712,7 +3712,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
- /* Older files do not hqve a msater collection, which is then added through
+ /* Older files do not have a master collection, which is then added through
* `BKE_collection_master_add()`, so everything is fine. */
if (scene->master_collection != NULL) {
scene->master_collection->id.flag |= LIB_PRIVATE_DATA;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index ff1839f997c..5442bb2edba 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -503,7 +503,7 @@ enum {
OB_DUPLIROT = 1 << 5,
OB_TRANSFLAG_UNUSED_6 = 1 << 6, /* cleared */
/* runtime, calculate derivedmesh for dupli before it's used */
- OB_DUPLICALCDERIVED = 1 << 7,
+ OB_TRANSFLAG_UNUSED_7 = 1 << 7, /* dirty */
OB_DUPLICOLLECTION = 1 << 8,
OB_DUPLIFACES = 1 << 9,
OB_DUPLIFACES_SCALE = 1 << 10,
More information about the Bf-blender-cvs
mailing list