diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-15 22:58:01 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-15 22:58:01 +0400 |
| commit | be1efd74d120068a9a650feddf512b50e5e6c2b8 (patch) | |
| tree | e1232b3256b84165f9194fe5287bf620cf174c18 /source/blender/blenloader | |
| parent | e63d4d2bea06075ef666d613d1136236bb09ae79 (diff) | |
2.5/Sculpt:
* Made sculpt mode local to object.
* This also fixes loading files from 2.4x saved in sculptmode
Touched a lot of things here, let me know if anything breaks
TODO:
* The other paint modes should be converted as well
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fc9cd47f1c2..a4dd61f82f7 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3994,6 +3994,9 @@ static void direct_link_object(FileData *fd, Object *ob) ob->derivedDeform= NULL; ob->derivedFinal= NULL; ob->gpulamp.first= ob->gpulamp.last= NULL; + + if(ob->sculpt) + ob->sculpt= MEM_callocN(sizeof(SculptSession), "reload sculpt session"); } /* ************ READ SCENE ***************** */ @@ -4147,9 +4150,6 @@ static void direct_link_scene(FileData *fd, Scene *sce) sce->toolsettings->sculpt= newdataadr(fd, sce->toolsettings->sculpt); sce->toolsettings->imapaint.paintcursor= NULL; sce->toolsettings->particle.paintcursor= NULL; - - if(sce->toolsettings->sculpt) - sce->toolsettings->sculpt->session= MEM_callocN(sizeof(SculptSession), "reload sculpt session"); } if(sce->ed) { |