diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-02 08:39:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-02 08:39:29 +0300 |
| commit | eae486f5e6c79b7b31e276dfaea69d2ece7fbf7f (patch) | |
| tree | dd8220e52333289fa538925a95367ae47a793e3d /source/blender/freestyle | |
| parent | cb23927c9b24d5b17e35c8682060cd6839337a12 (diff) | |
| parent | 0d8bf4bf947d84cdfc6e2b221ddb03c7f8d2114b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 560d060594f..743e6ceb7cf 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -526,7 +526,7 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const // We'll generate both with tips and without tips // coordinates, on two different UV layers. - if (ma->mtex[a]->texflag & MTEX_TIPS) { + if (ma->mtex[a]->texflag & MTEX_TIPS) { BLI_strncpy(ma->mtex[a]->uvname, uvNames[1], sizeof(ma->mtex[a]->uvname)); } else { |