diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
| commit | afb8fffb1827a4fffc8e6b3d620a02f59b62e3a9 (patch) | |
| tree | 328e3c204210d68392805f371ef4d296175b6b6e /intern/cycles/device/device.h | |
| parent | f306b50700b05707f44b5472ac0b38d58fb01b0d (diff) | |
| parent | 72ec4c813a2c544341d0c4ae83369cea60e52c9e (diff) | |
Merged revisions 45967-46052 from trunk/blendersoc-2011-cucumber
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index af2567498d9..87f255e54e7 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -25,6 +25,7 @@ #include "util_list.h" #include "util_string.h" +#include "util_task.h" #include "util_thread.h" #include "util_types.h" #include "util_vector.h" @@ -66,7 +67,7 @@ public: /* Device Task */ -class DeviceTask { +class DeviceTask : public Task { public: typedef enum { PATH_TRACE, TONEMAP, SHADER } Type; Type type; @@ -87,7 +88,6 @@ public: DeviceTask(Type type = PATH_TRACE); void split(list<DeviceTask>& tasks, int num); - void split(ThreadQueue<DeviceTask>& tasks, int num); void split_max_size(list<DeviceTask>& tasks, int max_size); }; |