griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r49175:49177

Browse Source
This commit is contained in:
Campbell Barton
2012-07-24 13:02:54 +00:00
parent f7a1819559 679847bd99
commit c363fc3dce
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/image.cpp
View File

@@ -235,6 +235,8 @@ bool ImageManager::file_load_image(Image *img, device_vector<uchar4>& tex_img)
return false;
}
printf("loading byte image: '%s' %dx%d\n", img->filename.c_str(), width, height);
/* read RGBA pixels */
uchar *pixels = (uchar*)tex_img.resize(width, height);
int scanlinesize = width*components*sizeof(uchar);
@@ -297,6 +299,8 @@ bool ImageManager::file_load_float_image(Image *img, device_vector<float4>& tex_
return false;
}
printf("loading float image: '%s' %dx%d\n", img->filename.c_str(), width, height);
/* read RGBA pixels */
float *pixels = (float*)tex_img.resize(width, height);
int scanlinesize = width*components*sizeof(float);