Revision f1a7118 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 12, 2015, 10:50 (GMT) |
Add missing AnimData ID to foreach_ID_loop. Atempt to fix missing action remapping, but no luck so far. :| |
Revision c9df632 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 12, 2015, 08:54 (GMT) |
Merge branch 'master' into id-remap |
Revision 11d4cbb by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 19:22 (GMT) |
Merge branch 'master' into id-remap |
Revision e74ce5b by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 18:53 (GMT) |
Merge branch 'master' into id-remap |
Revision ab5a591 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 17:12 (GMT) |
Do not try to reload directly non-linkable datablocks (shapekeys), those will get reloaded by 'owner' mesh anyway. Why, why, why are shapekeys datablocks??? |
Revision 483247d by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 16:43 (GMT) |
Fix Text usage by TextEditor (USER_REAL, not USER_ONE). |
Revision ded1333 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 15:52 (GMT) |
Rework a bit IDRemap struct to separate input flags from output status, and fix issues with unlinking ParticleSettings. We now have the option to still decrement user count of old_id, even if we could not replace it with NULL new_id (aka unlinking), needed to keep proper user count when unlinking and ID from datablocks it uses, to delete it. |
Revision 4cf00de by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 15:15 (GMT) |
Merge branch 'master' into id-remap |
Revision 61bad3c by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 14:06 (GMT) |
Merge branch 'master' into id-remap |
Revision 75c5f61 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 11:44 (GMT) |
Silence a bit debug prints! |
Revision 73c8d3a by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 11:43 (GMT) |
Merge branch 'master' into id-remap |
Revision 12292d4 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 10:49 (GMT) |
Merge branch 'master' into id-remap |
Revision 9e6cdd8 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 11, 2015, 09:48 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/intern/library.c Also clears now useless 'bool is_user_one' flag from editors' ID remap callback. |
Revision 7a62ac4 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 19:15 (GMT) |
Some minor tweaks. |
Revision d2913c1 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 18:59 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/intern/object.c |
Revision 5f02998 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 15:56 (GMT) |
Hopefully fix the 'real user' nightmare. Idea is to add two new flags, one saying 'we need to ensure a real user exists', the other 'we had to increment user count to ensure we have a real user'. This allows us to easily control the extra user in release/delete/remap cases, and also fixes the infamous 'add new image to texture, open image in ImageEditor, delete image from texture, have a zero-user red image in Image Editor' issue. There is still much to be done here, more places where we can use those flags, also clear them when we force usercount to zero, etc. All this allows us to fix unsolvable issues (like Group being ensure_user'ed in loading code, but only if they do have objects in them), and to avoid returning ugly bool from editors' callbacks (this is still to be cleaned up in the branch too). Bad news - this means we cannot use short ID->flag anymore (not enough flags), for now added a new int ID->flag2 (replacing pad int), not sure how to best manage change here, maybe for 2.8 we can totally wipe ID->flag? But this would totally break forward compat. |
Revision 9ddc60b by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 15:21 (GMT) |
Merge branch 'master' into id-remap |
Revision 959e2e8 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 10, 2015, 13:51 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/intern/library.c |
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 |
|