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:
authorLukas Stockner <lukas.stockner@freenet.de>2016-10-29 21:06:52 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2016-10-29 21:06:52 +0300
commit5aa6a2ec06bbfa9ddd255c90ee02da5f9be36f30 (patch)
treea35ea8aec0b558a4eb9068f6f806c0a8ba41fe91 /intern/cycles/kernel/kernel_shader.h
parent1272ee455e7aeed3f6acb0b8a8366af5ad6aec99 (diff)
Fix T49846: OpenCL rendering compilation failure
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
-rw-r--r--intern/cycles/kernel/kernel_shader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 6480975a84d..a8070a133de 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -276,7 +276,7 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg,
#ifdef __OBJECT_MOTION__
shader_setup_object_transforms(kg, sd, time);
-#else
+#endif
}
else if(lamp != LAMP_NONE) {
ccl_fetch(sd, ob_tfm) = lamp_fetch_transform(kg, lamp, false);