Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-09-20 13:28:58 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-09-20 13:28:58 +0400
commit556fa5e2055755764dff59d7702a2ccc0e08c344 (patch)
tree1cf66e204446000e49ff38d539dc0bb349bf8578 /source
parentaa077fecd71a3553eda90ecc39267107f396e513 (diff)
Fix for margin which didn't work properly with normalized displacement baking
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/bake.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c
index cd72c6af057..703db22371e 100644
--- a/source/blender/render/intern/source/bake.c
+++ b/source/blender/render/intern/source/bake.c
@@ -1084,12 +1084,12 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up
userdata = (BakeImBufuserData *)ibuf->userdata;
if (userdata) {
- RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, re->r.bake_filter);
-
if (use_displacement_buffer) {
RE_bake_ibuf_normalize_displacement(ibuf, userdata->displacement_buffer, userdata->mask_buffer,
displacement_min, displacement_max);
}
+
+ RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, re->r.bake_filter);
}
ibuf->userflags |= IB_BITMAPDIRTY;