Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-06 11:17:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-06 11:17:58 +0300
commit1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (patch)
tree982857c47d650cb3f53df065cdcbcca827bff56d /intern/cycles/device/device.h
parent62fbb7d4a10bea1ce88a486657a87743b93c9fd1 (diff)
Cleanup: strip trailing space for cycles
Diffstat (limited to 'intern/cycles/device/device.h')
-rw-r--r--intern/cycles/device/device.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index b856bdd9d01..2400788c833 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;
@@ -294,7 +294,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; }
@@ -304,7 +304,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 dx, int dy, int width, int height, bool transparent,
@@ -362,4 +362,3 @@ private:
CCL_NAMESPACE_END
#endif /* __DEVICE_H__ */
-