diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-02-25 15:22:42 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-02-25 15:22:42 +0300 |
| commit | 6e11cfc56af4e1594972d134e4e0c5d256d1fcce (patch) | |
| tree | a020bf157f20008b85a551ce94f3576acc0b4f47 /source/blender/blenkernel | |
| parent | 1a853a9e90e9f1a8a5028bd1ce37785e1b2ce6d5 (diff) | |
Curves: add surface object pointer
Ref T95776.
Differential Revision: https://developer.blender.org/D14182
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/curves.cc | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/lib_query.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc index 9935166f874..d7783c76f65 100644 --- a/source/blender/blenkernel/intern/curves.cc +++ b/source/blender/blenkernel/intern/curves.cc @@ -114,6 +114,7 @@ static void curves_foreach_id(ID *id, LibraryForeachIDData *data) for (int i = 0; i < curves->totcol; i++) { BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, curves->mat[i], IDWALK_CB_USER); } + BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, curves->surface, IDWALK_CB_NOP); } static void curves_blend_write(BlendWriter *writer, ID *id, const void *id_address) @@ -186,6 +187,7 @@ static void curves_blend_read_lib(BlendLibReader *reader, ID *id) for (int a = 0; a < curves->totcol; a++) { BLO_read_id_address(reader, curves->id.lib, &curves->mat[a]); } + BLO_read_id_address(reader, curves->id.lib, &curves->surface); } static void curves_blend_read_expand(BlendExpander *expander, ID *id) @@ -194,6 +196,7 @@ static void curves_blend_read_expand(BlendExpander *expander, ID *id) for (int a = 0; a < curves->totcol; a++) { BLO_expand(expander, curves->mat[a]); } + BLO_expand(expander, curves->surface); } IDTypeInfo IDType_ID_CV = { diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c index 0103e40e90d..5de8704e13b 100644 --- a/source/blender/blenkernel/intern/lib_query.c +++ b/source/blender/blenkernel/intern/lib_query.c @@ -448,7 +448,7 @@ uint64_t BKE_library_id_can_use_filter_id(const ID *id_owner) case ID_WS: return FILTER_ID_SCE; case ID_CV: - return FILTER_ID_MA; + return FILTER_ID_MA | FILTER_ID_OB; case ID_PT: return FILTER_ID_MA; case ID_VO: |