diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 16:34:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 16:34:17 +0300 |
| commit | f60896454929080ae775a7143c30722788ab83df (patch) | |
| tree | 33accd750fb55f00b33730c5bb601254799fd369 /intern/cycles/kernel | |
| parent | 403ae48063d91126bd36ca56920290bcb53f504e (diff) | |
| parent | 2c8bd1d8cb6dc0f1a182d77c6b8283b25a01f1eb (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_bevel.h | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index d573270fd76..afb9ff11c10 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -56,7 +56,7 @@ ccl_device_noinline void shader_setup_from_ray(KernelGlobals *kg, PROFILING_INIT(kg, PROFILING_SHADER_SETUP); #ifdef __INSTANCING__ - sd->object = (isect->object == PRIM_NONE)? kernel_tex_fetch(__prim_object, isect->prim): isect->object; + sd->object = (isect->object == OBJECT_NONE)? kernel_tex_fetch(__prim_object, isect->prim): isect->object; #endif sd->lamp = LAMP_NONE; @@ -411,7 +411,7 @@ ccl_device_inline void shader_setup_from_background(KernelGlobals *kg, ShaderDat sd->ray_length = 0.0f; #ifdef __INSTANCING__ - sd->object = PRIM_NONE; + sd->object = OBJECT_NONE; #endif sd->lamp = LAMP_NONE; sd->prim = PRIM_NONE; @@ -457,7 +457,7 @@ ccl_device_inline void shader_setup_from_volume(KernelGlobals *kg, ShaderData *s sd->ray_length = 0.0f; /* todo: can we set this to some useful value? */ # ifdef __INSTANCING__ - sd->object = PRIM_NONE; /* todo: fill this for texture coordinates */ + sd->object = OBJECT_NONE; /* todo: fill this for texture coordinates */ # endif sd->lamp = LAMP_NONE; sd->prim = PRIM_NONE; diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h index 96d132acd73..b5bb9df422b 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/svm_bevel.h @@ -146,7 +146,13 @@ ccl_device_noinline float3 svm_bevel( } #endif /* __OBJECT_MOTION__ */ + /* Get geometric normal. */ float3 hit_Ng = isect.Ng[hit]; + int object = (isect.hits[hit].object == OBJECT_NONE)? kernel_tex_fetch(__prim_object, isect.hits[hit].prim): isect.hits[hit].object; + int object_flag = kernel_tex_fetch(__object_flag, object); + if(object_flag & SD_OBJECT_NEGATIVE_SCALE_APPLIED) { + hit_Ng = -hit_Ng; + } /* Compute smooth normal. */ float3 N = hit_Ng; @@ -168,7 +174,7 @@ ccl_device_noinline float3 svm_bevel( } /* Transform normals to world space. */ - if(isect.hits[hit].object != OBJECT_NONE) { + if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) { object_normal_transform(kg, sd, &N); object_normal_transform(kg, sd, &hit_Ng); } |