4 Commits

Author	SHA1	Message	Date
Alexander Bock	6c15bebfff	Merge remote-tracking branch 'origin/kameleon' into properties	2014-05-02 16:59:50 +02:00
Alexander Bock	43e510fded	Fixed for Win32 compatability ... Renamed OpenCL qualifiers due to conflict with "ERROR" macros Removed boost::timer and boost::system dependencies Added fixed for Windows path handling	2014-05-02 10:48:16 +02:00
Jonas Strandstedt	59c92ca073	Merge branch 'develop' into kameleon ... Conflicts: src/rendering/renderablevolume.cpp src/rendering/renderablevolumeexpert.cpp	2014-04-24 12:14:02 -04:00
Jonas Strandstedt	a6a5207a5d	Moved from VolumeRaycaster to RenderableVolume ... - Removed old classes and moved code to the Renderables - RenderableVolume is now abstract with some helpful functions - Added swapinterval=0 to sgct config for performance analysis	2014-04-18 09:58:44 -04:00