Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 05:01:58 +0000 (15:01 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 05:01:58 +0000 (15:01 +1000)
1  2 
source/blender/freestyle/intern/stroke/Stroke.h

index 83e6a947917f3f0f4a01eeceb9129d8494f10a7b,ce63c528ac36b3c9ec440f53a6421a03211144ee..a813d516d444d3dc254c373ff3e3deb26fc303af
@@@ -44,7 -44,8 +44,7 @@@
  #endif
  
  extern "C" {
 -#include "DNA_material_types.h"
 -
 +struct MTex;
  struct bNodeTree;
  }
  
@@@ -582,8 -583,8 +582,8 @@@ public
         *  \param iNVertices
         *    The number of StrokeVertices we eventually want in our Stroke.
         *  \return the sampling that must be used in the Resample(float) method.
-        *  @see Resample(int)
-        *  @see Resample(float)
+        *  \see Resample(int)
+        *  \see Resample(float)
         */
        float ComputeSampling(int iNVertices);