<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>Hi,</div>
<div> </div>
<div>I've got one question on merging the master branch into the cycles_disney_brdf branch. I'd like to have the current implementation of the multiple scattering GGX in the Disney BSDF. ;-)</div>
<div>But here's the thing: If I do it like it is described here https://wiki.blender.org/index.php/Dev:Doc/Tools/Git, all of the commits in cycles_disney_brdf will be placed above the commits of the master branch (because of the rebase). But then every commit (also those that have already been pushed before) is published via the mailing list. Or am I wrong here? </div>
<div> </div>
<div>What is the best practise to do this?</div>
<div> </div>
<div>Pascal</div></div></body></html>