diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-03 13:51:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-03 13:54:59 +0400 |
| commit | b7f085d9c128f31d576c732c6439b5a71e8922ee (patch) | |
| tree | 8a1fdc2e95470f61d9121b18b125dc272e87d536 /source/blender/freestyle/intern/stroke/Stroke.cpp | |
| parent | 6ec2d72eca618be05e9bf0723886b10e6d5efa46 (diff) | |
Patch D246: Texture Marks for freestyle strokes, written and contributed by Paolo Acampora.
Reviewers: brecht, kjym3, #freestyle
Reviewed By: brecht, kjym3
Differential Revision: https://developer.blender.org/D246
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Stroke.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Stroke.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 86625e67405..9ed2cab8448 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -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)); |