[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54748] trunk/blender/source/blender/ render/intern/source/multires_bake.c: Fix #34351: Displacement map Bake margin does not work

[Sergey Sharybin]

Revision: 54748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54748
Author:   nazgul
Date:     2013-02-22 09:57:10 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Fix #34351: Displacement map Bake margin does not work

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/multires_bake.c

Modified: trunk/blender/source/blender/render/intern/source/multires_bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/multires_bake.c	2013-02-22 09:31:42 UTC (rev 54747)
+++ trunk/blender/source/blender/render/intern/source/multires_bake.c	2013-02-22 09:57:10 UTC (rev 54748)
@@ -1258,13 +1258,13 @@
 		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)