Revert "merge"
Revert "merge"

This reverts commit 199bb24582287b9619e26bc6a4b5ee646a243939, reversing
changes made to e2cef48d696eae886c0b566c83734f37e775b2db.

ospray/OSPRay,ospray/OSPRay,MengjiaoH/ospray,wilsonCernWq/ospray,wilsonCernWq/ospray,MengjiaoH/ospray,wilsonCernWq/ospray,ospray/OSPRay,ospray/OSPRay,MengjiaoH/ospray,MengjiaoH/ospray,MengjiaoH/ospray