Conflicts resolved: source/blender/render/intern/source/pipeline.c Also fixed an inconsistent conflict resolution in the last commit with regard to release/scripts/startup/bl_ui/properties_render.py. This problem resulted in empty menus in the GUI.
Conflicts resolved: source/blender/render/intern/source/pipeline.c Also fixed an inconsistent conflict resolution in the last commit with regard to release/scripts/startup/bl_ui/properties_render.py. This problem resulted in empty menus in the GUI.