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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-02-22 13:57:10 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-02-22 13:57:10 +0400
commit9b5b9e7a09d984f0b058a49f39cb5c6fe9d37cc6 (patch)
tree3ba3e9810fba0ea0c41c13749ca00c3bcb18c430 /source/blender/render
parentb30bdd5cb65bf13c2bfb0bc9d78b1d5393a43c8f (diff)
Fix #34351: Displacement map Bake margin does not work
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/multires_bake.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c
index ea42049989b..e81359e8fca 100644
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/source/multires_bake.c
@@ -1258,13 +1258,13 @@ static void finish_images(MultiresBakeRender *bkr, MultiresBakeResult *result)
if (ibuf->x <= 0 || ibuf->y <= 0)
continue;
- RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, bkr->bake_filter);
-
if (use_displacement_buffer) {
RE_bake_ibuf_normalize_displacement(ibuf, userdata->displacement_buffer, userdata->mask_buffer,
result->height_min, result->height_max);
}
+ RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, bkr->bake_filter);
+
ibuf->userflags |= IB_BITMAPDIRTY | IB_DISPLAY_BUFFER_INVALID;
if (ibuf->rect_float)