March 29, 2018, 12:27 (GMT) |
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/makesrna/intern/rna_ID.c |
March 19, 2018, 15:35 (GMT) |
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/blenloader/intern/readfile.c source/blender/windowmanager/WM_api.h source/blender/windowmanager/WM_types.h |
February 13, 2018, 08:50 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 12, 2018, 11:55 (GMT) |
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/blenkernel/intern/blender.c |
February 12, 2018, 11:42 (GMT) |
Add last missing piece of asset engine API, load_post callback. This allows asset engine to perform whatever they need on data-blocks (either linked or appended ones), once they have been added to Blender data (Main). This is an optional callback intended for advanced/complex asset management (and possibly also for generative procesing), basic asset engines should typically not need it. Amber uses it just to do some dummy testing prints right now. |
February 9, 2018, 16:24 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 9, 2018, 15:26 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 9, 2018, 13:43 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 7, 2018, 21:40 (GMT) |
Fixes for last merge. |
February 7, 2018, 21:30 (GMT) |
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/windowmanager/intern/wm_files_link.c |
February 7, 2018, 10:57 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 7, 2018, 09:26 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 7, 2018, 09:26 (GMT) |
Cleanup/internal renaming. |
February 7, 2018, 09:26 (GMT) |
Cleanup: remove asyncio version of Amber, and Claude, from branch for now. They make review patch even more confusing, and are useless/broken currently anyway. Claude will be redone later. |
February 2, 2018, 09:48 (GMT) |
Merge branch 'blender2.8' into asset-engine |
February 1, 2018, 15:42 (GMT) |
Merge branch 'blender2.8' into asset-engine |
January 29, 2018, 11:58 (GMT) |
Merge branch 'blender2.8' into asset-engine |
January 29, 2018, 09:28 (GMT) |
Merge branch 'blender2.8' into asset-engine |
January 28, 2018, 16:50 (GMT) |
Merge branch 'blender2.8' into asset-engine |
January 21, 2018, 16:37 (GMT) |
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/blenloader/intern/versioning_280.c source/blender/makesdna/DNA_ID.h |
|