[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37266] trunk/blender/source/blender/ editors/object/object_bake.c: Fix for new baker and float images.

[Sergey Sharybin]

Revision: 37266
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37266
Author:   nazgul
Date:     2011-06-06 19:06:44 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Fix for new baker and float images. Also removed code used for debugging.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_bake.c

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c   2011-06-06 
19:03:17 UTC (rev 37265)
+++ trunk/blender/source/blender/editors/object/object_bake.c   2011-06-06 
19:06:44 UTC (rev 37266)
@@ -651,6 +651,8 @@
                        }
                }
        }
+
+       ibuf->userflags= IB_RECT_INVALID;
 }
 
 static void free_heights_data(void *bake_data)
@@ -685,10 +687,6 @@
 
        lores_dm->getFace(lores_dm, face_index, &mface);
 
-       if(x==0 && y==0) {
-               zero_v3(p0);
-       }
-
        st0= mtface[face_index].uv[0];
        st1= mtface[face_index].uv[1];
        st2= mtface[face_index].uv[2];
@@ -731,6 +729,8 @@
        if(ibuf->rect_float) {
                float *rrgbf= ibuf->rect_float + pixel*4;
                rrgbf[3]= 1.0f;
+
+               ibuf->userflags= IB_RECT_INVALID;
        } else {
                char *rrgb= (char*)ibuf->rect + pixel*4;
                rrgb[3]= 255;
@@ -782,6 +782,8 @@
                rrgbf[1]= vec[1];
                rrgbf[2]= vec[2];
                rrgbf[3]= 1.0f;
+
+               ibuf->userflags= IB_RECT_INVALID;
        } else {
                char *rrgb= (char*)ibuf->rect + pixel*4;
                rrgb[0]= FTOCHAR(vec[0]);

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