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

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);