Hi Sergey, Did some testing and looked into the commits you mentioned to see if they got merged / left out correctly. All looks ok to me. Thanks for doing this messy job :)
Brecht. On Wed, May 9, 2012 at 12:20 AM, Sergey Sharybin <sergey....@gmail.com> wrote: > > * 46159: seems to be a fix for post-release merge tomato into trunk 46023 > with bunch of optimizations, changes are currently ignored > * 46179: some of changes in camera.cpp and object.cpp are related on 46114 > which > added support for motion vector and UV passes, later Brecht cleaned up > all changes related holdout due to the got mixed with motion blur. > * 46181: changes in rna_lamp touches code from rev46134 (merge Harmony branch) > and can not be applied on pre-merge state > * 46222: none changes applied - all of them is for code introduced in 46175 > which isn't getting backported to tag > * 46341: completely skip -- related to changes from 46279 which is not > getting backported > * 46277: changes to mesh.c (which the only actual interesting changes here) > are ignored. > Comment says "improvement to LAST commit" and this LAST commit is not > getting merged. Hopefully merge conflicts were resolved in a way which > keeps file in a state previous to 46276. > * Commits related on solidify modifier. They got totally screwed up > MOD_solidify.c > due to all that style cleanup and so. Finished up backporting MOD_solidify.c > from > trunk into tag by reverting style commits (seems all actual changes need to > be > backported there). Hopefully it's fine now. > * 46417: some Changes in smoke.c are related on changes made in merge commit > from > smoke2 branch into trunk. Hopefully the same changes works fine with > pre-merged smoke. _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers