Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix compilation error with minimal feature set

Browse Source
This commit is contained in:
Sergey Sharybin
2016-09-28 17:03:42 +02:00
parent c5d7602925
commit e1bfb89da2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/closure/bsdf.h
View File

@@ -374,6 +374,8 @@ ccl_device bool bsdf_merge(ShaderClosure *a, ShaderClosure *b)
default:
return false;
}
#else
return false;
#endif
}

10
intern/cycles/kernel/kernel_shader.h
View File

@@ -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
}