diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-25 22:02:15 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-25 22:02:15 +0400 |
commit | 920bb95aabf581e2cdf25568c77e276078c3689b (patch) | |
tree | 82e36fce6d0771e7ef6cfd41648ca3f5e6cfff95 /source/blender/freestyle/intern/stroke/Canvas.h | |
parent | 4be21b18f83a7606fdb764caa537e42ec9aa72fc (diff) |
soc-2008-mxcurioni: incorporated Tamito Kajiyama's patch, improving robustness for the Win32 build on older machines. In detail, the _blendEquation variable from AppCanvas is replaced by a _basic variable in Canvas, determing the rendering mode (standard with blending or basic). This latter variable is used to make sure that strokes are rendered in the right mode
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Canvas.h')
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Canvas.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 4f57cd9c36c..4dd13950daf 100755 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -82,7 +82,8 @@ protected: mapsMap _maps; static const char * _MapsPath; SteerableViewMap *_steerableViewMap; - + bool _basic; + public: /* Builds the Canvas */ Canvas(); @@ -184,7 +185,7 @@ public: void ReplaceStyleModule(unsigned index, StyleModule *iStyleModule); void setVisible(unsigned index, bool iVisible) ; //inline void setDensityMap(InformationMap<RGBImage>* iMap) {_DensityMap = iMap;} - inline void AddLayer(StrokeLayer *iLayer) {_Layers.push_back(iLayer);} + inline void AddLayer(StrokeLayer *iLayer) {_Layers.push_back(iLayer);} void resetModified(bool iMod=false); void causalStyleModules(std::vector<unsigned>& vec, unsigned index = 0); void setModified(unsigned index, bool b); |