June 7, 2016, 07:43 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/makesdna/DNA_ID.h |
June 7, 2016, 07:42 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/makesdna/DNA_ID.h |
Revision 18f87c8 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) June 7, 2016, 07:27 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenloader/intern/readfile.c |
May 31, 2016, 07:58 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
May 31, 2016, 07:58 (GMT) |
Merge branch 'id-remap' into asset-experiments |
May 31, 2016, 07:53 (GMT) |
Merge branch 'master' into asset-engine |
Revision 2c9f671 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 31, 2016, 07:53 (GMT) |
Fix merge error. |
Revision 9400ea0 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 31, 2016, 07:38 (GMT) |
Merge branch 'master' into id-remap |
May 24, 2016, 13:49 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
May 24, 2016, 13:49 (GMT) |
Merge branch 'id-remap' into asset-experiments |
May 24, 2016, 13:48 (GMT) |
Merge branch 'master' into asset-experiments |
May 24, 2016, 13:48 (GMT) |
Fix alignement issues in some DNA struct due to ID one now being properly aligned. |
May 24, 2016, 12:44 (GMT) |
Merge branch 'master' into asset-engine |
Revision ba1af2e by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 24, 2016, 12:43 (GMT) |
Some cleanup. |
Revision adbd9cb by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 24, 2016, 12:10 (GMT) |
Better name handling in case we remap an ID adn cannot replace it totally. |
Revision 16641d4 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 24, 2016, 10:29 (GMT) |
Merge branch 'master' into id-remap |
Revision 4795d6b by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 23, 2016, 16:18 (GMT) |
Merge branch 'master' into id-remap |
May 9, 2016, 13:12 (GMT) |
Revert "Squashed commit of the atomic-operations branch." This reverts commit ffe7f4175a30daada4ad75ac666515d5624a719f. |
May 9, 2016, 13:11 (GMT) |
Squashed commit of the atomic-operations branch. |
May 6, 2016, 11:34 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
|
|
RSS Feeds |
Master Commits
MiikaHweb | 2003-2021