Page MenuHome
Differential D1485

Attempt to fix T34446 by carefully reusing existing LIB data, and reloading in a 'classical' way missing ones.
ClosedPublic
Actions

Authored by Bastien Montagne (mont29) on Aug 25 2015, 5:33 PM.

Details

Reviewers
Campbell Barton (campbellbarton)
Sergey Sharybin (sergey)
Maniphest Tasks
T34446: Make Local on linked mesh object: object gets removed if redo function is used
Commits
rBS07332dd2bbe6: Fix T34446: Make Local on linked mesh object: object gets removed if redo…
rB07332dd2bbe6: Fix T34446: Make Local on linked mesh object: object gets removed if redo…
Summary

Fixes undo/redo making disappear linked data, see comments in T34446 for details.

Notes:

  • This patch was tested with both own simple libs setup (including proxy and indirect linking).
  • This patch was tested with a Gooseberry production file (02_meet_victor) as well.
  • About Speed: memreadfile during undo ops not involving libs: 45ms with master code, 50ms with this patch (undo involving a complete libs re-reading is 1200 ms). Think this is acceptable.

Diff Detail

Repository
rB Blender
Branch
t34446-fix-attempt

Event Timeline

Bastien Montagne (mont29) updated this revision to Diff 4939.Aug 25 2015, 5:33 PM
Bastien Montagne (mont29) added a task: T34446: Make Local on linked mesh object: object gets removed if redo function is used.
Bastien Montagne (mont29) retitled this revision from to Attempt to fix T34446 by carefully reusing existing LIB data, and reloading in a 'classical' way missing ones..
Bastien Montagne (mont29) updated this object.
Bastien Montagne (mont29) mentioned this in T34446: Make Local on linked mesh object: object gets removed if redo function is used.Aug 25 2015, 5:34 PM
Bastien Montagne (mont29) updated this revision to Diff 4941.Aug 25 2015, 8:08 PM
  • Final fix - actually solution was simple, just needed to add old->new address to fd->libmap…
Bastien Montagne (mont29) added reviewers: Campbell Barton (campbellbarton), Sergey Sharybin (sergey).Aug 25 2015, 8:11 PM
Bastien Montagne (mont29) added a project: BF Blender.
Bastien Montagne (mont29) updated this object.
Bastien Montagne (mont29) updated this revision to Diff 4958.Aug 28 2015, 8:21 PM

Fixed bugs (crashes) with indirect libs & co...

  • Some cleanup...
  • Fix broken undo/redo with nasty indirect-linked libs.
Bastien Montagne (mont29) updated this revision to Diff 4967.Aug 29 2015, 5:13 PM
  • Cleanup.
  • Fix bad usage of fd->mainlist, some more cleanup.
  • Looks like we do not read back lib bheads here in the end. :)

Patch sounds good for master to me now...

Bastien Montagne (mont29) updated this object.Aug 29 2015, 5:16 PM
mathieu menuet (bliblubli) awarded a token.Sep 6 2015, 9:33 AM
Bastien Montagne (mont29) updated this revision to Diff 5115.Oct 5 2015, 12:31 PM

Updated against latest master.

Closed by commit rB07332dd2bbe6: Fix T34446: Make Local on linked mesh object: object gets removed if redo… (authored by Bastien Montagne (mont29)). · Explain WhyOct 12 2015, 12:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
source/
blender/
blenloader/
intern/
55 lines
5 lines
97 lines

Diff 4967

View Options

source/blender/blenloader/intern/readblenentry.c

Loading...
View Options

source/blender/blenloader/intern/readfile.h

Loading...
View Options

source/blender/blenloader/intern/readfile.c

Loading...