[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53985] trunk/blender/source/blender/ render/intern/source/rendercore.c: Fix #33951: Only margin is correctly baked for non-displacement baking

[Sergey Sharybin]

Revision: 53985
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53985
Author:   nazgul
Date:     2013-01-22 09:37:46 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Fix #33951: Only margin is correctly baked for non-displacement baking

Was own mistake in recent changes.

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

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c      
2013-01-22 08:05:00 UTC (rev 53984)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c      
2013-01-22 09:37:46 UTC (rev 53985)
@@ -2892,9 +2892,11 @@
                use_mask = TRUE;
 
        /* do we need buffer to store displacements  */
-       if ((R.r.bake_flag & R_BAKE_NORMALIZE) && R.r.bake_maxdist == 0.0f) {
-               use_displacement_buffer = TRUE;
-               use_mask = TRUE;
+       if (type == RE_BAKE_DISPLACEMENT) {
+               if ((R.r.bake_flag & R_BAKE_NORMALIZE) && R.r.bake_maxdist == 
0.0f) {
+                       use_displacement_buffer = TRUE;
+                       use_mask = TRUE;
+               }
        }
 
        /* baker uses this flag to detect if image was initialized */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs