Pulling in the objects with the group is bad and wasn't intended. give_base_to_objects() had very confusing arguments, just made some minor changes to avoid making the same error in r36762 again. preparing a new fix which only makes changes for appending non-group datablocks which indirectly appends in objects.
On Sat, May 21, 2011 at 6:04 AM, Joshua Leung <[email protected]> wrote: > Revision: 36808 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36808 > Author: aligorith > Date: 2011-05-21 06:04:44 +0000 (Sat, 21 May 2011) > Log Message: > ----------- > Bugfix [#27452] Wrong linking of character groups > > Linking in groups also ended up adding those objects to the current > scene that we're linking the group in to. This is a regression. It > leads to more work (and/or confusion) from animators when just trying > to get a character into a shot file to start animating it (see my > notes on my blog for the proper workflow regarding this). > > Reverting r36762, which caused this mess. > > Revision Links: > -------------- > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36762 > > Modified Paths: > -------------- > trunk/blender/source/blender/blenloader/intern/readfile.c > > Modified: trunk/blender/source/blender/blenloader/intern/readfile.c > =================================================================== > --- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-21 > 05:34:20 UTC (rev 36807) > +++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-21 > 06:04:44 UTC (rev 36808) > @@ -12738,13 +12738,6 @@ > if(ob->id.us==0) { > do_it= 1; > } > - else if (lib==NULL) { /* appending */ > - if(object_in_any_scene(mainvar, > ob)==0) { > - /* when appending, make sure > any indirectly loaded objects > - * get a base else they cant > be accessed at all [#27437] */ > - do_it= 1; > - } > - } > else if(ob->id.us==1 && lib) { > if(ob->id.lib==lib && (ob->flag & > OB_FROMGROUP) && object_in_any_scene(mainvar, ob)==0) { > do_it= 1; > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > -- - Campbell _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
