[Bf-blender-cvs] [a7f5418caaf] master: Cleanup: consistent includes.

Brecht Van Lommel noreply at git.blender.org
Wed Aug 29 16:41:26 CEST 2018


Commit: a7f5418caafd6dba9ff98f15805a4f296554d213
Author: Brecht Van Lommel
Date:   Wed Aug 29 13:54:26 2018 +0200
Branches: master
https://developer.blender.org/rBa7f5418caafd6dba9ff98f15805a4f296554d213

Cleanup: consistent includes.

===================================================================

M	intern/cycles/render/osl.cpp
M	intern/cycles/render/osl.h

===================================================================

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 2bf69c869b9..496e9d9491a 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -28,7 +28,6 @@
 #include "kernel/osl/osl_globals.h"
 #include "kernel/osl/osl_services.h"
 #include "kernel/osl/osl_shader.h"
-#include "OSL/llvm_util.h"
 
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index 09d1a54d0b9..966fc1965d7 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -26,6 +26,7 @@
 #include "render/shader.h"
 
 #ifdef WITH_OSL
+#include <OSL/llvm_util.h>
 #include <OSL/oslcomp.h>
 #include <OSL/oslexec.h>
 #include <OSL/oslquery.h>



More information about the Bf-blender-cvs mailing list