Revision 965d964 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 13:47 (GMT) |
Minor update/cleanup on usercount, from work done in master. |
Revision 033a899 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 11:45 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/intern/curve.c source/blender/blenkernel/intern/linestyle.c source/blender/blenkernel/intern/material.c source/blender/blenkernel/intern/mball.c source/blender/blenkernel/intern/mesh.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle.c source/blender/blenkernel/intern/scene.c source/blender/blenkernel/intern/world.c |
Revision e43d70a by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 8, 2015, 16:59 (GMT) |
Merge branch 'master' into id-remap |
Revision 7f53cbb by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 7, 2015, 10:31 (GMT) |
Cleanup: get rid of bmain in foreach ID callback. messing with depsgraph here is not a good idea I think... and makes things simpler! |
Revision 8b6928b by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 7, 2015, 09:54 (GMT) |
Merge branch 'master' into id-remap |
Revision f0c6c85 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 6, 2015, 17:00 (GMT) |
Attempt to fix the 'user_one' mess... Seems to work (though will need much more tests), but makes code more ugly. :| |
Revision 0c8b1a8 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 6, 2015, 11:35 (GMT) |
Merge branch 'master' into id-remap |
November 2, 2015, 18:27 (GMT) |
Merge branch 'master' into asset-engine |
Revision 9521d71 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 2, 2015, 18:22 (GMT) |
Merge branch 'master' into id-remap |
October 27, 2015, 14:05 (GMT) |
Merge branch 'master' into asset-engine |
Revision 6bf915e by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 27, 2015, 14:04 (GMT) |
Merge branch 'master' into id-remap |
October 17, 2015, 09:47 (GMT) |
Merge branch 'master' into asset-engine |
Revision 2d7bc36 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 17, 2015, 09:39 (GMT) |
Merge branch 'missing-libs' into id-remap |
Revision 177295f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 17, 2015, 09:34 (GMT) |
Merge branch 'master' into missing-libs |
October 15, 2015, 15:13 (GMT) |
Merge branch 'master' into asset-engine |
Revision de71f7a by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 15, 2015, 15:03 (GMT) |
Fix deadlock. Would be really cool if Main spinlock could be re-entrant. :| |
Revision 6da735e by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 15, 2015, 14:55 (GMT) |
Merge branch 'missing-libs' into id-remap |
Revision 59ff3b5 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 15, 2015, 14:12 (GMT) |
Merge branch 'master' into missing-libs |
Revision 9a97965 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 15, 2015, 13:33 (GMT) |
Fix broken ID placeholder code (from recent merges). Here we need a bit different handling than in missing-lib branch... |
October 15, 2015, 12:29 (GMT) |
Merge branch 'master' into asset-engine |
|
|
RSS Feeds |
Master Commits
MiikaHweb | 2003-2021