diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-09 16:42:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-09 16:42:19 +0400 |
commit | 1e30f000308debebf7cd5bbf6a9b37b8a94182de (patch) | |
tree | d6edeb35644fd1048d4b71d1f55ef1ab019bacef /source/blender/freestyle/intern/stroke | |
parent | 8a20433f0fef5ab2d881d010cd5bd19fe484e555 (diff) | |
parent | 80f6671dfe64ece1e692c8032e1d1169621bceff (diff) |
Merged changes in the trunk up to revision 28685.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Canvas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index c1843b7a6c1..25ed11f6732 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -38,7 +38,6 @@ extern "C" { #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "intern/IMB_bmp.h" } using namespace std; @@ -419,7 +418,8 @@ int rowbytes = w*4; stringstream filename; filename << base; filename << i << ".bmp"; - imb_savebmp(qtmp, const_cast<char *>(filename.str().c_str()), 0); + qtmp->ftype= BMP; + IMB_saveiff(qtmp, const_cast<char *>(filename.str().c_str()), IB_rect); } // QImage *qtmp = new QImage(w, h, 32); |