Revision b9c5da9 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 18, 2015, 21:17 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_outliner/outliner_intern.h source/blender/editors/space_outliner/outliner_tools.c |
Revision 4eaa6c4 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 18, 2015, 20:23 (GMT) |
Merge branch 'master' into id-remap |
December 17, 2015, 18:39 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c |
Revision dab1a1d by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 17, 2015, 18:32 (GMT) |
Merge main remap funcs' bool parameters into a single bitflag. Too much bools kill bools. |
Revision 24556b3 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 17, 2015, 13:56 (GMT) |
More cleanup - remove unused stuff, some simplifications. |
Revision 817fee3 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 17, 2015, 12:21 (GMT) |
Cleanup: mostly removes useless diff from master. |
December 16, 2015, 21:28 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/windowmanager/intern/wm_operators.c |
December 16, 2015, 20:50 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
December 16, 2015, 20:50 (GMT) |
Merge branch 'master' into asset-experiments |
December 16, 2015, 20:39 (GMT) |
Merge branch 'master' into asset-engine |
Revision c089f28 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 16, 2015, 20:34 (GMT) |
Merge branch 'master' into id-remap |
December 14, 2015, 15:26 (GMT) |
Merge branch 'master' into asset-engine |
Revision d0b037d by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 14, 2015, 15:26 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/intern/text.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_outliner/outliner_tools.c |
Revision 8bbfd27 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 7, 2015, 16:45 (GMT) |
Merge branch 'master' into id-remap |
Revision 6dffedc by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 7, 2015, 16:33 (GMT) |
Fix several issues with logic of core id-remap: * We need to clear the 'user-one' flags and potential usercount for old_id. * We need to consider ID usages inside a same lib as **never** being indirect ones. Also re-enabled proxy checking for now (not sure why I commented it, think testing stuff or so...). |
Revision 49b67b5 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 7, 2015, 14:54 (GMT) |
Fix id-remap looper not 'freeing' 'use-one' id usercount. |
Revision 67cc51d by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 7, 2015, 10:01 (GMT) |
Merge branch 'master' into id-remap |
December 7, 2015, 10:00 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/editors/space_file/file_intern.h source/blender/editors/space_file/file_ops.c |
Revision 05bd957 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 4, 2015, 16:48 (GMT) |
Some more fixes, and make Outliner's delete available for all IDs, not only libraries! |
Revision 56679ae by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 4, 2015, 16:24 (GMT) |
Merge branch 'master' into id-remap |
|
|
RSS Feeds |
Master Commits
MiikaHweb | 2003-2021