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... |
Revision 5a65830 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 7, 2016, 13:51 (GMT) |
Fix a crash when deleting a lib featuring some proxyob source... |
Revision f2db96f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 7, 2016, 09:28 (GMT) |
Merge branch 'master' into id-remap |
Revision 2e82971 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 6, 2016, 20:40 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/BKE_library_query.h source/blender/blenkernel/intern/library_query.c source/blender/makesrna/intern/rna_ID.c |
January 4, 2016, 19:41 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
January 4, 2016, 19:41 (GMT) |
Merge branch 'id-remap' into asset-experiments |
January 4, 2016, 19:35 (GMT) |
Merge branch 'master' into asset-engine |
Revision fc7f086 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 4, 2016, 19:34 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/intern/library.c |
January 4, 2016, 11:10 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
January 4, 2016, 11:10 (GMT) |
Merge branch 'id-remap' into asset-experiments |
January 4, 2016, 10:55 (GMT) |
Merge branch 'master' into asset-engine |
Revision e921eca by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) January 4, 2016, 09:58 (GMT) |
Merge branch 'master' into id-remap |
December 31, 2015, 11:56 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
December 31, 2015, 11:56 (GMT) |
Merge branch 'id-remap' into asset-experiments |
December 31, 2015, 11:50 (GMT) |
Merge branch 'master' into asset-engine |
Revision 9ae928f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 31, 2015, 11:50 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_material.h |
December 27, 2015, 12:09 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
December 27, 2015, 12:09 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/blenkernel/intern/library.c source/blender/windowmanager/intern/wm_operators.c |
December 27, 2015, 12:06 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/intern/library.c source/blender/windowmanager/intern/wm_operators.c |
|
|
RSS Feeds |
Master Commits
MiikaHweb | 2003-2021