diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-19 00:40:43 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-19 00:40:43 +0400 |
commit | 894daa01be1ba5b2f128b1e779d9a38c4c4e7700 (patch) | |
tree | e03309f3c35c2108fe8ac817336106b23e2301c2 /source/blender/freestyle/intern | |
parent | 90b69a13a7f7b829c2eb314d1fd1efd56fd0a487 (diff) | |
parent | bf09c851a97aba67b19a5fc85a91d874e28d1df1 (diff) |
Merged changes in the trunk up to revision 32565.
Diffstat (limited to 'source/blender/freestyle/intern')
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index d536bd7f5b4..d67f05ddb92 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -403,7 +403,7 @@ int rowbytes = w*4; // h = pyramid.height(i); //soc QImage qtmp(ow, oh, QImage::Format_RGB32); - ImBuf *qtmp = IMB_allocImBuf(ow, oh, 32, IB_rect, 0); + ImBuf *qtmp = IMB_allocImBuf(ow, oh, 32, IB_rect); //int k = (1<<i); for(y=0;y<oh;++y){ diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index ee2f2085d12..934755b8231 100755 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -77,7 +77,7 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter int status = BPY_run_python_script(_context, fn, NULL, reports); #else int status; - Text *text = add_text(fn, G.sce); + Text *text = add_text(fn, G.main->name); if (text) { status = BPY_run_python_script(_context, NULL, text, reports); unlink_text(G.main, text); diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index d1d9eb71e77..6b76c2512f0 100755 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -220,7 +220,7 @@ void SteerableViewMap::saveSteerableViewMap() const { for(int j=0; j<_imagesPyramids[i]->getNumberOfLevels(); ++j){ //soc float coeff = 1;//1/255.f; //100*255;//*pow(2,j); //soc QImage qtmp(ow, oh, QImage::Format_RGB32); - ImBuf *ibuf = IMB_allocImBuf(ow, oh, 32, IB_rect, 0); + ImBuf *ibuf = IMB_allocImBuf(ow, oh, 32, IB_rect); int rowbytes = ow*4; char *pix; |