February 14, 2016, 19:31 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
February 14, 2016, 19:31 (GMT) |
Merge branch 'id-remap' into asset-experiments |
February 14, 2016, 19:27 (GMT) |
Merge branch 'master' into asset-engine |
Revision ad72025 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) February 14, 2016, 19:24 (GMT) |
Merge branch 'master' into id-remap |
February 12, 2016, 09:06 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
February 12, 2016, 09:05 (GMT) |
Merge branch 'id-remap' into asset-experiments |
February 12, 2016, 09:05 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/intern/library.c |
Revision 71b65b4 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) February 12, 2016, 08:55 (GMT) |
Merge branch 'master' into id-remap |
February 3, 2016, 09:06 (GMT) |
Merge branch 'master' into asset-engine |
February 2, 2016, 13:14 (GMT) |
Assets: add uuid to linked data, write and read it from file. Note that this is only very first steps, I think we'll need to 'propagate' uuid to all data used/linked by asset itself, otherwise most things won't get updated/reloaded. Still have to think about this. |
February 2, 2016, 13:10 (GMT) |
Merge branch 'master' into asset-engine |
February 1, 2016, 13:05 (GMT) |
Merge branch 'id-remap' into asset-experiments |
Revision 1b34246 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) February 1, 2016, 13:04 (GMT) |
Merge branch 'master' into id-remap |
January 31, 2016, 14:09 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
January 31, 2016, 14:09 (GMT) |
Merge branch 'id-remap' into asset-experiments |
January 31, 2016, 14:05 (GMT) |
Merge branch 'master' into asset-engine |
Revision 5b16d59 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 31, 2016, 13:59 (GMT) |
Merge branch 'master' into id-remap |
January 21, 2016, 15:12 (GMT) |
Assets: add uuid to linked data, write and read it from file. Note that this is only very first steps, I think we'll need to 'propagate' uuid to all data used/linked by asset itself, otherwise most things won't get updated/reloaded. Still have to think about this. |
January 21, 2016, 08:46 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
January 21, 2016, 08:46 (GMT) |
Merge branch 'id-remap' into asset-experiments |
|