Move BVHType and shadingsystem enums to top-level of Cycles namespace.
[blender.git] / intern / cycles / render / session.h
index 8c597c431bb545e58267b080eb9e5655fdea822e..2d29015863c05dbcf9e2b2ded6adac9d1ae27caa 100644 (file)
@@ -24,6 +24,7 @@
 #include "util_progress.h"
 #include "util_stats.h"
 #include "util_thread.h"
+#include "util_types.h"
 #include "util_vector.h"
 
 CCL_NAMESPACE_BEGIN
@@ -59,7 +60,7 @@ public:
        double reset_timeout;
        double text_timeout;
 
-       enum { OSL, SVM } shadingsystem;
+       ShadingSystem shadingsystem;
 
        SessionParams()
        {
@@ -136,6 +137,7 @@ public:
        void set_samples(int samples);
        void set_pause(bool pause);
 
+       void update_scene();
        void device_free();
 protected:
        struct DelayedReset {
@@ -147,7 +149,6 @@ protected:
 
        void run();
 
-       void update_scene();
        void update_status_time(bool show_pause = false, bool show_done = false);
 
        void tonemap(int sample);