Blender Git Commit Log

Git Commits -> Revision f751e34

March 13, 2015, 14:18 (GMT)
Revert "Merge branch 'asset-engine' into asset-experiments"

This reverts commit ccd14792005083e4da5fdca2e82dfa6093082f35, reversing
changes made to 8da3bb3885e803c67f1d06e4fc2f11d98d9011b9.

Conflicts:
release/scripts/startup/bl_operators/__init__.py
release/scripts/startup/bl_operators/amber.py
source/blender/blenkernel/BKE_asset.h
source/blender/blenkernel/intern/asset.c
source/blender/editors/space_file/file_ops.c
source/blender/makesrna/intern/rna_asset.c

Commit Details:

Full Hash: f751e34f91f63b97ffd31821beacfae79335777e
Parent Commit: 47ce2c5
Lines Changed: +181, -1828

4 Deleted Paths:

/release/scripts/startup/bl_operators/amber.py (+0, -83)
/source/blender/blenkernel/BKE_asset.h (+0, -168)
/source/blender/blenkernel/intern/asset.c (+0, -315)
/source/blender/makesrna/intern/rna_asset.c (+0, -897)

19 Modified Paths:

/release/scripts/modules/bpy_types.py (+0, -4) (Diff)
/release/scripts/startup/bl_operators/__init__.py (+0, -2) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+0, -1) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+99, -169) (Diff)
/source/blender/editors/space_file/filelist.h (+7, -12) (Diff)
/source/blender/editors/space_file/file_intern.h (+3, -0) (Diff)
/source/blender/editors/space_file/file_ops.c (+61, -85) (Diff)
/source/blender/editors/space_file/space_file.c (+2, -11) (Diff)
/source/blender/makesdna/DNA_space_types.h (+2, -4) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+0, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -50) (Diff)
/source/blender/makesrna/RNA_access.h (+0, -5) (Diff)
/source/blender/python/intern/bpy_rna.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+3, -7) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -3) (Diff)
/source/creator/creator.c (+2, -5) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021