[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60257] trunk/blender/source/blender/ render/intern/source/bake.c: Fix for margin which didn' t work properly with normalized displacement baking

[Sergey Sharybin]

Revision: 60257
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60257
Author:   nazgul
Date:     2013-09-20 09:28:58 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Fix for margin which didn't work properly with normalized displacement baking

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

Modified: trunk/blender/source/blender/render/intern/source/bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/bake.c	2013-09-20 09:28:52 UTC (rev 60256)
+++ trunk/blender/source/blender/render/intern/source/bake.c	2013-09-20 09:28:58 UTC (rev 60257)
@@ -1084,12 +1084,12 @@
 
 				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;