tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.0-release'

This commit is contained in:
Campbell Barton 2023-10-05 13:16:20 +11:00
parent 5e7fd352c9 c9130e38e3
commit 60b2b663cc
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@ -495,7 +495,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
} }
} }
/* Explicitly opt-in to the secure codeing for the restorable state. /* Explicitly opt-in to the secure coding for the restorable state.
* *
* This is something that only has affect on macOS 12+, and is implicitly * This is something that only has affect on macOS 12+, and is implicitly
* enabled on macOS 14. * enabled on macOS 14.

2
source/blender/blenlib/intern/string_cursor_utf8.c
View File

@ -44,7 +44,7 @@ static eStrCursorDelimType cursor_delim_type_unicode(const uint uch)
switch (uch) { switch (uch) {
case ',': case ',':
case '.': case '.':
case 0x2026: /* Horizontal elipsis. */ case 0x2026: /* Horizontal ellipsis. */
case 0x3002: /* CJK full width full stop. */ case 0x3002: /* CJK full width full stop. */
case 0xFF0C: /* CJK full width comma. */ case 0xFF0C: /* CJK full width comma. */
case 0xFF61: /* CJK half width full stop. */ case 0xFF61: /* CJK half width full stop. */

10
source/blender/blenloader/intern/versioning_280.cc
View File

@ -2411,9 +2411,9 @@ void do_versions_after_linking_280(FileData *fd, Main *bmain)
} }
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 280, 14)) { if (!MAIN_VERSION_FILE_ATLEAST(bmain, 280, 14)) {
/* This code fixes crashes when loading early 2.80 dev files, due to the lack of a master /* This code fixes crashes when loading early 2.80 development files, due to the lack of a
* collection after removal of the versioning code handling the 'SceneCollection' data that was * master collection after removal of the versioning code handling the 'SceneCollection' data
* part of the very early 2.80 development (commit 23835a393c). * that was part of the very early 2.80 development (commit 23835a393c).
* *
* NOTE: This code only ensures that there is no crash, since the whole collection hierarchy * NOTE: This code only ensures that there is no crash, since the whole collection hierarchy
* from these files remain lost, these files will still need a lot of manual work if one want * from these files remain lost, these files will still need a lot of manual work if one want
@ -2422,8 +2422,8 @@ void do_versions_after_linking_280(FileData *fd, Main *bmain)
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
if (scene->master_collection == nullptr) { if (scene->master_collection == nullptr) {
scene->master_collection = BKE_collection_master_add(scene); scene->master_collection = BKE_collection_master_add(scene);
/* #BKE_layer_collection_sync accepts missing viewlayer in a scene, but not invalid ones /* #BKE_layer_collection_sync accepts missing view-layer in a scene, but not invalid ones
* where the first viewlayer's layercollection would not be for the Scene's master * where the first view-layer's layer-collection would not be for the Scene's master
* collection. */ * collection. */
LISTBASE_FOREACH (ViewLayer *, view_layer, &scene->view_layers) { LISTBASE_FOREACH (ViewLayer *, view_layer, &scene->view_layers) {
if (LayerCollection *first_layer_collection = static_cast<LayerCollection *>( if (LayerCollection *first_layer_collection = static_cast<LayerCollection *>(

1
tools/check_source/check_spelling_config.py
View File

@ -323,6 +323,7 @@ dict_custom = {
"rescale", "rescale",
"rescaled", "rescaled",
"respecialized", "respecialized",
"restorable",
"resynced", "resynced",
"resyncing", "resyncing",
"retiming", "retiming",