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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-08-23 18:34:34 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-08-23 18:34:34 +0400
commit01e22d1b9f3606d97f06c2d8a2bc969214322e9c (patch)
treefcbb80481ea74c731891b5151c94b1c0b9cbb3d1 /intern/cycles/kernel/kernel_emission.h
parent22f48748771a96526c3abcfd6583f7cf86aa88c8 (diff)
Cycles: more code refactoring to rename things internally as well. Also change
property name back so we keep compatibility.
Diffstat (limited to 'intern/cycles/kernel/kernel_emission.h')
-rw-r--r--intern/cycles/kernel/kernel_emission.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h
index be4c1ddc797..0c8d69fb594 100644
--- a/intern/cycles/kernel/kernel_emission.h
+++ b/intern/cycles/kernel/kernel_emission.h
@@ -76,7 +76,7 @@ __device_noinline bool direct_emission(KernelGlobals *kg, ShaderData *sd, int li
{
LightSample ls;
-#ifdef __NON_PROGRESSIVE__
+#ifdef __BRANCHED_PATH__
if(lindex != -1) {
/* sample position on a specified light */
light_select(kg, lindex, randu, randv, sd->P, &ls);