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:
authorTianwei Shen <shentianweipku@gmail.com>2017-04-15 16:44:48 +0300
committerTianwei Shen <shentianweipku@gmail.com>2017-04-15 16:44:48 +0300
commitf11ff0e672b8df79cdab85c8bebbd8c36c2c1cff (patch)
treec80138a7af123907c3eb26fee978644c702795cf /intern/cycles/kernel/osl/emissive.cpp
parent473653f33798b727148e8f6379f31cbba95de479 (diff)
parent97c9c6a3f321f35f0b58ab167aea97a790c94cfb (diff)
Merge branch 'master' into soc-2016-multiviewsoc-2016-multiview
Diffstat (limited to 'intern/cycles/kernel/osl/emissive.cpp')
-rw-r--r--intern/cycles/kernel/osl/emissive.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp
index 3f13e08b302..8843a196dad 100644
--- a/intern/cycles/kernel/osl/emissive.cpp
+++ b/intern/cycles/kernel/osl/emissive.cpp
@@ -34,12 +34,12 @@
#include <OSL/genclosure.h>
-#include "osl_closures.h"
+#include "kernel/osl/osl_closures.h"
-#include "kernel_compat_cpu.h"
-#include "kernel_types.h"
-#include "closure/alloc.h"
-#include "closure/emissive.h"
+#include "kernel/kernel_compat_cpu.h"
+#include "kernel/kernel_types.h"
+#include "kernel/closure/alloc.h"
+#include "kernel/closure/emissive.h"
CCL_NAMESPACE_BEGIN