Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 03fffc08b6 - Show all commits

1
source/blender/blenkernel/intern/collection.c
View File

@ -1210,6 +1210,7 @@ static void collection_gobject_assert_internal_consistency(Collection *collectio
collection_gobject_hash_create(collection); collection_gobject_hash_create(collection);
} }
GHash *gobject_hash = collection->runtime.gobject_hash; GHash *gobject_hash = collection->runtime.gobject_hash;
UNUSED_VARS_NDEBUG(gobject_hash);
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) { LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
BLI_assert(cob->ob != NULL); BLI_assert(cob->ob != NULL);
/* If there are more than one CollectionObject for the same object, at most one of them will /* If there are more than one CollectionObject for the same object, at most one of them will