[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29690] branches/render25/source/blender/ blenkernel/intern/customdata.c: Render Branch: better error message when failing to read displacements.

[Brecht Van Lommel]

Revision: 29690
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29690
Author:   blendix
Date:     2010-06-25 15:01:04 +0200 (Fri, 25 Jun 2010)

Log Message:
-----------
Render Branch: better error message when failing to read displacements.

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/customdata.c

Modified: branches/render25/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/customdata.c     
2010-06-25 12:47:32 UTC (rev 29689)
+++ branches/render25/source/blender/blenkernel/intern/customdata.c     
2010-06-25 13:01:04 UTC (rev 29690)
@@ -559,7 +559,7 @@
                        d[i].disps = MEM_callocN(sizeof(float)*3*d[i].totdisp, 
"mdisps read");
 
                if(!cdf_read_data(cdf, d[i].totdisp*3*sizeof(float), 
d[i].disps)) {
-                       printf("failed to read multires displacement %d/%d 
%d\n", i, count, d[i].totdisp);
+                       printf("Can't read multires displacement %d/%d %d 
(subdivision level mismatch?)\n", i, count, d[i].totdisp);
                        return 0;
                }
        }
@@ -574,7 +574,7 @@
 
        for(i = 0; i < count; ++i) {
                if(!cdf_write_data(cdf, d[i].totdisp*3*sizeof(float), 
d[i].disps)) {
-                       printf("failed to write multires displacement %d/%d 
%d\n", i, count, d[i].totdisp);
+                       printf("Failed to write multires displacement %d/%d 
%d\n", i, count, d[i].totdisp);
                        return 0;
                }
        }
@@ -2387,8 +2387,10 @@
 
                        if(blay) {
                                if(cdf_read_layer(cdf, blay)) {
-                                       if(typeInfo->read(cdf, layer->data, 
totelem));
-                                       else break;
+                                       if(!typeInfo->read(cdf, layer->data, 
totelem)) {
+                                               printf("Failed to read file 
%s\n", filename);
+                                               break;
+                                       }
                                        layer->flag |= CD_FLAG_IN_MEMORY;
                                }
                                else
@@ -2462,8 +2464,10 @@
                        blay= cdf_layer_find(cdf, layer->type, layer->name);
 
                        if(cdf_write_layer(cdf, blay)) {
-                               if(typeInfo->write(cdf, layer->data, totelem));
-                               else break;
+                               if(!typeInfo->write(cdf, layer->data, totelem)) 
{
+                                       printf("Failed to write file %s\n", 
filename);
+                                       break;
+                               }
                        }
                        else
                                break;


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