May 6, 2016, 11:34 (GMT) |
Merge branch 'id-remap' into asset-experiments |
May 6, 2016, 11:33 (GMT) |
Merge branch 'master' into asset-experiments |
May 6, 2016, 11:30 (GMT) |
Merge branch 'master' into asset-engine |
Revision cbe6475 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 6, 2016, 11:28 (GMT) |
Merge branch 'master' into id-remap |
May 6, 2016, 11:16 (GMT) |
First 'working' version of asset reload. Dead dummy simplistic test runs (nearly) OK here (only have a memleak from versionning code...), but obviously will need much serious tests to validate everything. Also, many things in code will need cleanup/refactor. Not to mention UI/UX. But we do have asset version check & reload on file opening now! :D Process summary: I) Open .blend file exactly as in master, load assets just like any other linked data (add placeholders in case not found). II) Check all asset engines and ask them whether each asset is OK, needs to be updated/reloaded, is missing... III) User then can decide to actually reload the asset, or not. Step II) happens in an async job (since engines using remote storage/database could take some time to answer), step III) is a locking task (just like initial linking). This should allow user to not be blocked at all by that asset update process. |
May 6, 2016, 11:05 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/blenloader/intern/readfile.c |
Revision 961ebfa by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 6, 2016, 11:03 (GMT) |
Set a main's version to current one after do_version is done. With current master this is not an issue, but with all the reload stuff, a same main could end up going several time into 'do_version', which is absolutely not desired (multi-allocations, repeating conversions over some values, etc.). |
May 6, 2016, 09:09 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
May 6, 2016, 09:07 (GMT) |
Do not update asset repo info inside link code. Whole 'database' is rebuilt later anyway, and in more complex 'asset reload' cases (where we may actually be reloading same asset with same uuid from same lib file), this creates confusion... |
May 5, 2016, 15:20 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
May 5, 2016, 15:19 (GMT) |
Add global 'asset search by uuid' helper. |
May 3, 2016, 15:52 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
May 3, 2016, 15:52 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/windowmanager/intern/wm_files_link.c |
May 3, 2016, 15:45 (GMT) |
Merge branch 'master' into asset-experiments |
May 3, 2016, 15:45 (GMT) |
Merge branch 'master' into asset-engine |
Revision a6a8ff1 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 3, 2016, 15:42 (GMT) |
Lib relocate/reload: serious rework of code. Idea here is to both factorize it seriously (reload and relocate are very similar, let's avoid as much as possible twice the same code...), and make new `lib_relocate_do()` much more flexible - now it should be able to reload individual IDs as well (plan is to use it to reload assets in relelvant branch too). |
Revision a97da98 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 3, 2016, 14:58 (GMT) |
Merge branch 'master' into id-remap |
May 3, 2016, 13:32 (GMT) |
Merge branch 'master' into asset-engine |
Revision 41c5ec2 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 3, 2016, 13:32 (GMT) |
Merge branch 'master' into id-remap |
May 3, 2016, 07:57 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
|