diff options
| author | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
| commit | 41216d5ad4c722e2ad9f15c968af454fc7566d5e (patch) | |
| tree | f68fe3e1dd32a2d651b6678a1783e165ce2e70c8 /source/blender/blenkernel/intern/library_query.c | |
| parent | cfdd902d2d5d560262d1218861ad1a4469c5259f (diff) | |
Cleanup: Remove more #if 0 blocks
Continuation of https://developer.blender.org/D3802
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3808
Diffstat (limited to 'source/blender/blenkernel/intern/library_query.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 7938d82eb80..e82e1cf2d6b 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -1064,14 +1064,8 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used) return (ELEM(id_type_used, ID_OB, ID_WO, ID_SCE, ID_MC, ID_MA, ID_GR, ID_TXT, ID_LS, ID_MSK, ID_SO, ID_GD, ID_BR, ID_PAL, ID_IM, ID_NT)); case ID_OB: - /* Could be the following, but simpler to just always say 'yes' here. */ -#if 0 - return ELEM(id_type_used, ID_ME, ID_CU, ID_MB, ID_LT, ID_SPK, ID_AR, ID_LA, ID_CA, /* obdata */ - ID_OB, ID_MA, ID_GD, ID_GR, ID_TE, ID_PA, ID_TXT, ID_SO, ID_MC, ID_IM, ID_AC - /* + constraints and modifiers ... */); -#else + /* Could be more specific, but simpler to just always say 'yes' here. */ return true; -#endif case ID_ME: return ELEM(id_type_used, ID_ME, ID_KE, ID_MA, ID_IM); case ID_CU: @@ -1099,12 +1093,8 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used) case ID_GR: return ELEM(id_type_used, ID_OB, ID_GR); case ID_NT: - /* Could be the following, but node.id has no type restriction... */ -#if 0 - return ELEM(id_type_used, ID_GD /* + node.id types... */); -#else + /* Could be more specific, but node.id has no type restriction... */ return true; -#endif case ID_BR: return ELEM(id_type_used, ID_BR, ID_IM, ID_PC, ID_TE, ID_MA); case ID_PA: |