Commit: e1bfb89da25e1e879d046144dfccb12e914c97c0
Author: Sergey Sharybin
Date: Wed Sep 28 17:03:42 2016 +0200
Branches: master
https://developer.blender.org/rBe1bfb89da25e1e879d046144dfccb12e914c97c0
Cycles: Fix compilation error with minimal feature set
===================================================================
M intern/cycles/kernel/closure/bsdf.h
M intern/cycles/kernel/kernel_shader.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf.h
b/intern/cycles/kernel/closure/bsdf.h
index 1e7fbdb..2ab92ba 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -374,6 +374,8 @@ ccl_device bool bsdf_merge(ShaderClosure *a, ShaderClosure
*b)
default:
return false;
}
+#else
+ return false;
#endif
}
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index c36d940..3e098c9 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -851,11 +851,11 @@ ccl_device void shader_eval_surface(KernelGlobals *kg,
ShaderData *sd, ccl_addr_
#ifdef __SVM__
svm_eval_nodes(kg, sd, state, SHADER_TYPE_SURFACE, path_flag);
#else
- ccl_fetch_array(sd, closure, 0)->weight = make_float3(0.8f,
0.8f, 0.8f);
- ccl_fetch_array(sd, closure, 0)->N = ccl_fetch(sd, N);
- ccl_fetch_array(sd, closure, 0)->data0 = 0.0f;
- ccl_fetch_array(sd, closure, 0)->data1 = 0.0f;
- ccl_fetch(sd, flag) |= bsdf_diffuse_setup(ccl_fetch_array(sd,
closure, 0));
+ DiffuseBsdf *bsdf = (DiffuseBsdf*)bsdf_alloc(sd,
+
sizeof(DiffuseBsdf),
+ make_float3(0.8f,
0.8f, 0.8f));
+ bsdf->N = ccl_fetch(sd, N);
+ ccl_fetch(sd, flag) |= bsdf_diffuse_setup(bsdf);
#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
