January 21, 2016, 08:45 (GMT) |
Merge branch 'master' into asset-engine |
Revision 911095d by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 21, 2016, 08:45 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/editors/space_outliner/outliner_tools.c |
January 20, 2016, 14:31 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
January 20, 2016, 14:30 (GMT) |
Merge branch 'id-remap' into asset-experiments |
January 20, 2016, 14:02 (GMT) |
Merge branch 'master' into asset-engine |
Revision 1705fd6 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 20, 2016, 14:02 (GMT) |
Merge branch 'master' into id-remap |
Revision 28adc7d by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 20, 2016, 13:27 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/intern/library_query.c |
January 15, 2016, 15:31 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
January 15, 2016, 15:31 (GMT) |
Merge branch 'id-remap' into asset-experiments |
January 15, 2016, 15:24 (GMT) |
Merge branch 'master' into asset-engine |
Revision 6eec8ea by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 15, 2016, 14:26 (GMT) |
Merge branch 'master' into id-remap |
January 14, 2016, 19:32 (GMT) |
Merge branch 'asset-engine' into asset-experiments Conflicts: source/blender/windowmanager/intern/wm_operators.c |
January 14, 2016, 19:29 (GMT) |
Fix handling of asset uuid in WMLinkAppendDataItem helper struct. We need a pointer here (reduces mem footprint, and allows to say 'we have no uuid' with a NULL value!). |
January 12, 2016, 15:23 (GMT) |
Merge branch 'asset-engine' into asset-experiments Conflicts: source/blender/blenkernel/intern/library.c |
January 12, 2016, 15:21 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/blenkernel/intern/library.c |
January 12, 2016, 15:08 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/intern/library.c |
Revision a414edc by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 12, 2016, 15:01 (GMT) |
Merge branch 'master' into id-remap |
Revision 4c535c0 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 7, 2016, 20:47 (GMT) |
Fix & cleanup in outliner area. Now all new entries in items' menus should behave correctly! |
Revision 22f5a17 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 7, 2016, 15:14 (GMT) |
Fix some bad id->flag/tag mismatch from not-so-recent merge with master... |
Revision 07b8b90 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 7, 2016, 15:11 (GMT) |
Fix assert when deleting obdata. Issue here is again with NEVER_NULL usages: obdata (& co) would be dereferenced twice. I'm not totally happy with this solution, ideally remap should never leave Main in invalid state, but for now it will do... |
|
|
RSS Syötteet |
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021