Alright, rebased commits from temp-blender2.8-stable onto blender2.8 and deleted the temp branch. Note that I intentionally used rebase to preserve commit history (though, I squashed some relating commits). It were only a handful of commits so thought it wouldn't be too noisy.
On 10 February 2017 at 22:57, Mike Erwin <[email protected]> wrote: > Thanks for fixing these issues so quickly! > > There *was* a very big reason to move development, but after testing the > latest blender2.8 on Mac, things are much better now. Ready for > reunification. > > Mike Erwin > musician, naturalist, pixel pusher, hacker extraordinaire > > On Fri, Feb 10, 2017 at 3:26 PM, Dalai Felinto <[email protected]> wrote: > >> Hi, >> >> > a temp-blender2.8-stable branch (...) >> >> Can we get rid of it now? Blender2.8 has those issues solved already. >> There is no reason to move development away from it. >> >> Cheers, >> Dalai >> -- >> blendernetwork.org/dalai-felinto >> www.dalaifelinto.com >> >> >> 2017-02-07 21:03 GMT+01:00 Mike Erwin <[email protected]>: >> > A few things need to be fixed ASAP to make 2.8 usable: >> > - select objects in the (non-clay) viewport >> > - visual feedback during object transform (G, S, R) >> > >> > LucaRood made a temp-blender2.8-stable branch that excludes these merges >> so >> > other people can continue working. Any work there will be merged back >> into >> > blender2.8. >> > >> > FYI (everyone) the clay engine does not work on Mac or Mesa. Expect it to >> > crash! Windows or Linux with vendor drivers are the best platforms for >> > testing. Once we finish the GL upgrade to 3.3 core profile it will work >> > everywhere. >> > >> > Mike Erwin >> > musician, naturalist, pixel pusher, hacker extraordinaire >> > >> > On Tue, Feb 7, 2017 at 5:45 AM, Dalai Felinto <[email protected]> >> wrote: >> > >> >> Hi there, >> >> Just to inform the list that the viewport related branches were merged >> >> in blender2.8. >> >> >> >> Render-Layers: >> >> https://developer.blender.org/rBaeb8e81f2741aabc95d14bce7a83 >> cef45481959c >> >> >> >> Clay-Engine: >> >> https://developer.blender.org/rB83adc544382689217e19564fd5f2 >> dd62160956cb >> >> >> >> The branches still have todos, and help is welcome as usual. Refer to >> >> their respective commits for more details. >> >> >> >> Apart from that the merges were done "manually", squashing the >> >> branches into single commits. >> >> >> >> In other words, if you had a fork of one of those branches (as I know >> >> at least Alexander Romanov had), you will need to manually cherry-pick >> >> your work to be on top of blender2.8. Poke me on IRC (dfelinto at >> >> #blendercoders) if you need any assistance. >> >> >> >> All the best, >> >> Dalai >> >> -- >> >> blendernetwork.org/dalai-felinto >> >> www.dalaifelinto.com >> >> _______________________________________________ >> >> Bf-viewport mailing list >> >> [email protected] >> >> https://lists.blender.org/mailman/listinfo/bf-viewport >> >> >> > _______________________________________________ >> > Bf-committers mailing list >> > [email protected] >> > https://lists.blender.org/mailman/listinfo/bf-committers >> _______________________________________________ >> Bf-committers mailing list >> [email protected] >> https://lists.blender.org/mailman/listinfo/bf-committers >> > _______________________________________________ > Bf-committers mailing list > [email protected] > https://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-committers
