Add fix for uninitialized variable when energy is zero in object editing. Also add define switch.