Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-10-19 16:39:10 +0300
committerHans Goudey <h.goudey@me.com>2021-10-19 16:39:10 +0300
commit219058c213d5c9efce3f44216f6513edc93b5536 (patch)
tree26b76ae133b36d41c9a90d43eaa29ebf2b943c5a /source/blender/blenkernel/intern/lib_id.c
parentcd36f59027042ff0f2ad53e98088428a4c0c5e38 (diff)
Geometry Nodes: Remove implicit realizing and conversion
This commit removes the implicit conversion from points to a mesh that used to happen before the next modifier. It also removes the implicit realizing of instances that happened before another modifier. Now we have specific nodes for both of these operations, the implicit conversions make less sense, and implicit instance realizing has already been removed in other nodes. This adds another geometry nodes modifier before modifiers that would have realized instances implicitly before. Currently adding another data-block during versioning after linking means that an assert needs to be changed. That should be made unnecessary by T92333. Differential Revision: https://developer.blender.org/D12722
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id.c')
-rw-r--r--source/blender/blenkernel/intern/lib_id.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 3b2d2c5d2c3..3c85ba62d07 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -1121,8 +1121,9 @@ void *BKE_libblock_alloc(Main *bmain, short type, const char *name, const int fl
id->us = 1;
}
if ((flag & LIB_ID_CREATE_NO_MAIN) == 0) {
- /* Note that 2.8x versioning has tested not to cause conflicts. */
- BLI_assert(bmain->is_locked_for_linking == false || ELEM(type, ID_WS, ID_GR));
+ /* Note that 2.8x versioning has tested not to cause conflicts. Node trees are
+ * skipped in this check to allow adding a geometry node tree for versioning. */
+ BLI_assert(bmain->is_locked_for_linking == false || ELEM(type, ID_WS, ID_GR, ID_NT));
ListBase *lb = which_libbase(bmain, type);
BKE_main_lock(bmain);