Assetify for Blender will get Non-Principled BSDF baking support! #blender3d
I’m working on a setup that allows you to bake shaders and materials made up out of more shaders than just a principled BSDF node with just one simple checkbox “Non-Principled BSDF baking”. Check out Assetify for Blender on Gumroad...