[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36886] branches/soc-2011-onion/source/ blender/imbuf/intern/scaling.c: GSOC - 2011

[Ryakiotakis Antonis]

Revision: 36886
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36886
Author:   psy-fi
Date:     2011-05-24 22:51:11 +0000 (Tue, 24 May 2011)
Log Message:
-----------
GSOC - 2011

minor fix for item #27478, blender could crash after loading .exr files

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/imbuf/intern/scaling.c

Modified: branches/soc-2011-onion/source/blender/imbuf/intern/scaling.c
===================================================================
--- branches/soc-2011-onion/source/blender/imbuf/intern/scaling.c       
2011-05-24 21:59:59 UTC (rev 36885)
+++ branches/soc-2011-onion/source/blender/imbuf/intern/scaling.c       
2011-05-24 22:51:11 UTC (rev 36886)
@@ -306,9 +306,11 @@
        
        p1f = ibuf1->rect_float;
        destf=ibuf2->rect_float;
+       if((ibuf2->rect == NULL)){
+               imb_addrectImBuf(ibuf2);
+       }
        p1 = (uchar *) ibuf1->rect;
        dest=(uchar *) ibuf2->rect;
-
        do_float= (ibuf1->rect_float != NULL && ibuf2->rect_float != NULL);
 
        for(y=ibuf2->y;y>0;y--){

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