Fix #33951: Only margin is correctly baked for non-displacement baking

Was own mistake in recent changes.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53985 954f8c5b-7b00-dc11-b283-0030488c597c