Blender Git Loki
Git Commits -> Revision 42d7580
July 9, 2020, 18:19 (GMT) |
Remove asset data-block again, back to ID.asset_data design So rather than having an asset data-block to reference data-blocks, let the data-blocks reference asset-data. After talking to Brecht, it seems that this approach is just fine. I previously added the data-block type because I saw some benefits (faster & simpler asset metadata reading, non-data-block assets, better file-browser integration, simple remapping of referenced data-blocks), but there are ways to do the same without the data-block. It's a bit more complicated that way, but still very doable. |
Commit Details:
Full Hash: 42d75801de24456569abfb9c0d99686c77379c34
Parent Commit: 243a59b
Lines Changed: +100, -259
30 Modified Paths:
/source/blender/blenkernel/BKE_asset.h (+5, -7) (Diff)
/source/blender/blenkernel/BKE_icons.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_idtype.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -2) (Diff)
/source/blender/blenkernel/intern/asset.c (+13, -56) (Diff)
/source/blender/blenkernel/intern/icons.c (+6, -3) (Diff)
/source/blender/blenkernel/intern/idtype.c (+1, -6) (Diff)
/source/blender/blenkernel/intern/lib_query.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/main.c (+0, -4) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+0, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+7, -29) (Diff)
/source/blender/blenloader/intern/writefile.c (+13, -21) (Diff)
/source/blender/blentranslation/BLT_translation.h (+0, -2) (Diff)
/source/blender/editors/asset/asset_ops.c (+2, -15) (Diff)
/source/blender/editors/interface/interface_icons.c (+0, -3) (Diff)
/source/blender/editors/interface/interface_templates.c (+0, -3) (Diff)
/source/blender/editors/render/render_opengl.c (+0, -1) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+0, -4) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+1, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+0, -3) (Diff)
/source/blender/makesdna/DNA_asset_defaults.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_asset_types.h (+9, -19) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -4) (Diff)
/source/blender/makesdna/intern/dna_defaults.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_asset.c (+36, -35) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+0, -7) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_main.c (+0, -7) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+0, -17) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_icons.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_idtype.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -2) (Diff)
/source/blender/blenkernel/intern/asset.c (+13, -56) (Diff)
/source/blender/blenkernel/intern/icons.c (+6, -3) (Diff)
/source/blender/blenkernel/intern/idtype.c (+1, -6) (Diff)
/source/blender/blenkernel/intern/lib_query.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/main.c (+0, -4) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+0, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+7, -29) (Diff)
/source/blender/blenloader/intern/writefile.c (+13, -21) (Diff)
/source/blender/blentranslation/BLT_translation.h (+0, -2) (Diff)
/source/blender/editors/asset/asset_ops.c (+2, -15) (Diff)
/source/blender/editors/interface/interface_icons.c (+0, -3) (Diff)
/source/blender/editors/interface/interface_templates.c (+0, -3) (Diff)
/source/blender/editors/render/render_opengl.c (+0, -1) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+0, -4) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+1, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+0, -3) (Diff)
/source/blender/makesdna/DNA_asset_defaults.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_asset_types.h (+9, -19) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -4) (Diff)
/source/blender/makesdna/intern/dna_defaults.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_asset.c (+36, -35) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+0, -7) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_main.c (+0, -7) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+0, -17) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021