diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
| commit | de777ad9e69320500bf05d97a7d6d60ba4fd0a93 (patch) | |
| tree | a1141843a3e1df137bbc6490641bedf12a12a8fa /intern/cycles/device/device.h | |
| parent | 6d38d824377c55aaaed7e8283e81a7128bf6f728 (diff) | |
| parent | 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 31deba2d796..585d9802279 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -123,7 +123,7 @@ public: /* Use OpenSubdiv patch evaluation */ bool use_patch_evaluation; - + /* Use Transparent shadows */ bool use_transparent; @@ -307,7 +307,7 @@ public: /* open shading language, only for CPU device */ virtual void *osl_memory() { return NULL; } - /* load/compile kernels, must be called before adding tasks */ + /* load/compile kernels, must be called before adding tasks */ virtual bool load_kernels( const DeviceRequestedFeatures& /*requested_features*/) { return true; } @@ -317,7 +317,7 @@ public: virtual void task_add(DeviceTask& task) = 0; virtual void task_wait() = 0; virtual void task_cancel() = 0; - + /* opengl drawing */ virtual void draw_pixels(device_memory& mem, int y, int w, int h, int width, int height, @@ -376,4 +376,3 @@ private: CCL_NAMESPACE_END #endif /* __DEVICE_H__ */ - |