Blender Git Commit Log
Git Commits -> Revision e615009
March 13, 2015, 14:21 (GMT) |
Revert "Revert "Merge branch 'asset-engine' into asset-experiments"" This reverts commit f751e34f91f63b97ffd31821beacfae79335777e. |
Commit Details:
Full Hash: e615009ae4a0ba7adf82a9e61a360d827342aefd
Parent Commit: f751e34
Lines Changed: +1828, -181
4 Added Paths:
/release/scripts/startup/bl_operators/amber.py (+83, -0) (View)
/source/blender/blenkernel/BKE_asset.h (+168, -0) (View)
/source/blender/blenkernel/intern/asset.c (+315, -0) (View)
/source/blender/makesrna/intern/rna_asset.c (+897, -0) (View)
/source/blender/blenkernel/BKE_asset.h (+168, -0) (View)
/source/blender/blenkernel/intern/asset.c (+315, -0) (View)
/source/blender/makesrna/intern/rna_asset.c (+897, -0) (View)
19 Modified Paths:
/release/scripts/modules/bpy_types.py (+4, -0) (Diff)
/release/scripts/startup/bl_operators/__init__.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+1, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+169, -99) (Diff)
/source/blender/editors/space_file/filelist.h (+12, -7) (Diff)
/source/blender/editors/space_file/file_intern.h (+0, -3) (Diff)
/source/blender/editors/space_file/file_ops.c (+85, -61) (Diff)
/source/blender/editors/space_file/space_file.c (+11, -2) (Diff)
/source/blender/makesdna/DNA_space_types.h (+4, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+50, -1) (Diff)
/source/blender/makesrna/RNA_access.h (+5, -0) (Diff)
/source/blender/python/intern/bpy_rna.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+7, -3) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+3, -0) (Diff)
/source/creator/creator.c (+5, -2) (Diff)
/release/scripts/startup/bl_operators/__init__.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+1, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+169, -99) (Diff)
/source/blender/editors/space_file/filelist.h (+12, -7) (Diff)
/source/blender/editors/space_file/file_intern.h (+0, -3) (Diff)
/source/blender/editors/space_file/file_ops.c (+85, -61) (Diff)
/source/blender/editors/space_file/space_file.c (+11, -2) (Diff)
/source/blender/makesdna/DNA_space_types.h (+4, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+50, -1) (Diff)
/source/blender/makesrna/RNA_access.h (+5, -0) (Diff)
/source/blender/python/intern/bpy_rna.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+7, -3) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+3, -0) (Diff)
/source/creator/creator.c (+5, -2) (Diff)