blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender2.7'

This commit is contained in:
Brecht Van Lommel 2019-03-11 14:34:17 +01:00
parent 403ae48063 2c8bd1d8cb
commit f608964549
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
intern/cycles/kernel/svm/svm_bevel.h
View File

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

1
intern/cycles/render/buffers.cpp
View File

@ -184,6 +184,7 @@ bool RenderBuffers::get_denoising_pass_rect(int type, float exposure, int sample
if(type == DENOISING_PASS_CLEAN) {
/* The clean pass isn't changed by prefiltering, so we use the original one there. */
offset = type + params.get_denoising_offset();
scale /= sample;
}
else if (type == DENOISING_PASS_PREFILTERED_COLOR && !params.denoising_prefiltered_pass) {
/* If we're not saving the prefiltering result, return the original noisy pass. */

2
source/blender/editors/object/object_bake_api.c
View File

@ -192,7 +192,7 @@ static bool write_internal_bake_pixels(
RE_bake_mask_fill(pixel_array, num_pixels, mask_buffer);
}
is_float = (ibuf->flags & IB_rectfloat);
is_float = (ibuf->rect_float != NULL);
/* colormanagement conversions */
if (!is_noncolor) {