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-11-25 00:01:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-25 00:01:14 +0300
commite742e0934de6384eeaf271ca4cfe99922ddbe3fb (patch)
treeefb52ddea766e0bf31dca3341c3e8e6cf330fffb /intern/cycles/render
parente5bc9fae54d2906cdc49278ec148343869fede0c (diff)
Cleanup: trailing space
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/scene.cpp4
-rw-r--r--intern/cycles/render/shader.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index ccaca8707c8..c96a1b78537 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -215,7 +215,7 @@ void Scene::device_update(Device *device_, Progress& progress)
object_manager->device_update(device, &dscene, this, progress);
if(progress.get_cancel() || device->have_error()) return;
-
+
progress.set_status("Updating Hair Systems");
curve_system_manager->device_update(device, &dscene, this, progress);
@@ -245,7 +245,7 @@ void Scene::device_update(Device *device_, Progress& progress)
camera->device_update_volume(device, &dscene, this);
if(progress.get_cancel() || device->have_error()) return;
-
+
progress.set_status("Updating Lookup Tables");
lookup_tables->device_update(device, &dscene);
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index d6c2d7502f2..df16ae800d0 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -525,7 +525,7 @@ void ShaderManager::device_update_common(Device *device,
flag |= SD_HAS_CONSTANT_EMISSION;
uint32_t cryptomatte_id = util_murmur_hash3(shader->name.c_str(), shader->name.length(), 0);
-
+
/* regular shader */
kshader->flags = flag;
kshader->pass_id = shader->pass_id;