diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-21 22:34:27 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-21 22:34:27 +0400 |
| commit | 709a86a8d96825069820dca4b68da5739bcd791c (patch) | |
| tree | 709d12886c10058c696b526c3dc433065aab7df3 /source/blender/render/extern | |
| parent | effaa79ffbc9357414209ea3f17529b7b4318328 (diff) | |
Multires baker: fix wrong normalization if baking happens to multiple images
Previously normalization will happen per image buffer individually, which
was wrong in cases different faces of the sane mesh uses different images.
Also solved possible threading issues when calculating min.max displacement.
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 8818aa67c32..d686de21517 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -186,7 +186,6 @@ typedef struct ShadeInput { typedef struct BakeImBufuserData { float *displacement_buffer; - float displacement_min, displacement_max; char *mask_buffer; } BakeImBufuserData; @@ -212,7 +211,7 @@ struct Object; int RE_bake_shade_all_selected(struct Render *re, int type, struct Object *actob, short *do_update, float *progress); struct Image *RE_bake_shade_get_image(void); void RE_bake_ibuf_filter(struct ImBuf *ibuf, char *mask, const int filter); -void RE_bake_ibuf_normalize_displacement(struct ImBuf *ibuf, float *displacement, char *mask, float global_displacement_min, float global_displacement_max); +void RE_bake_ibuf_normalize_displacement(struct ImBuf *ibuf, float *displacement, char *mask, float displacement_min, float displacement_max); #define BAKE_RESULT_OK 0 #define BAKE_RESULT_NO_OBJECTS 1 |