[Bf-blender-cvs] [d6313f47af8] master: Fix T55564: Cycles OpenCL build error on some scenes.

Brecht Van Lommel noreply at git.blender.org
Thu Jun 21 13:55:13 CEST 2018


Commit: d6313f47af8aa0156fa3beffad71cd689eadf397
Author: Brecht Van Lommel
Date:   Thu Jun 21 11:18:51 2018 +0200
Branches: master
https://developer.blender.org/rBd6313f47af8aa0156fa3beffad71cd689eadf397

Fix T55564: Cycles OpenCL build error on some scenes.

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

M	intern/cycles/kernel/svm/svm.h

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

diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 10d5fe0e42b..2bee4bc7b69 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -144,7 +144,6 @@ CCL_NAMESPACE_END
 #include "kernel/svm/svm_color_util.h"
 #include "kernel/svm/svm_math_util.h"
 
-#include "kernel/svm/svm_ao.h"
 #include "kernel/svm/svm_attribute.h"
 #include "kernel/svm/svm_gradient.h"
 #include "kernel/svm/svm_blackbody.h"
@@ -185,6 +184,7 @@ CCL_NAMESPACE_END
 #include "kernel/svm/svm_bump.h"
 
 #ifdef __SHADER_RAYTRACE__
+#  include "kernel/svm/svm_ao.h"
 #  include "kernel/svm/svm_bevel.h"
 #endif



More information about the Bf-blender-cvs mailing list