diff options
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Stroke.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Stroke.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 159e4a39849..6629de0fa04 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -26,8 +26,8 @@ */ #include "Stroke.h" -#include "StrokeAdvancedIterators.h" #include "StrokeIterators.h" +#include "StrokeAdvancedIterators.h" #include "StrokeRenderer.h" #include "BKE_global.h" @@ -106,7 +106,7 @@ StrokeAttribute::StrokeAttribute(const StrokeAttribute& a1, const StrokeAttribut for (int i = 0; i < 3; ++i) _color[i] = (1 - t) * a1._color[i] + t * a2._color[i]; - _visible = true; + _visible = a1.isVisible(); // FIXME: to be checked (and enhanced) if ((a1._userAttributesReal) && (a2._userAttributesReal)) { @@ -393,6 +393,10 @@ Stroke::Stroke() //_mediumType = DEFAULT_STROKE; _mediumType = OPAQUE_MEDIUM; _textureId = 0; + _textureStep = 1.0; + for (int a = 0; a < MAX_MTEX; a++) { + _mtex[a] = NULL; + } _tips = false; _rep = NULL; } @@ -411,6 +415,15 @@ Stroke::Stroke(const Stroke& iBrother) _sampling = iBrother._sampling; _mediumType = iBrother._mediumType; _textureId = iBrother._textureId; + _textureStep = iBrother._textureStep; + for (int a = 0; a < MAX_MTEX; a++) { + if (iBrother._mtex) { + _mtex[a] = iBrother._mtex[a]; + } + else { + _mtex[a] = NULL; + } + } _tips = iBrother._tips; if (iBrother._rep) _rep = new StrokeRep(*(iBrother._rep)); |