diff options
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/geometry/Noise.cpp | 4 | ||||
-rw-r--r-- | source/blender/freestyle/intern/stroke/Stroke.cpp | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/freestyle/intern/geometry/Noise.cpp b/source/blender/freestyle/intern/geometry/Noise.cpp index 8ec56e84f95..dd5f2f6ea4c 100644 --- a/source/blender/freestyle/intern/geometry/Noise.cpp +++ b/source/blender/freestyle/intern/geometry/Noise.cpp @@ -147,7 +147,7 @@ float Noise::smoothNoise2(Vec2f& vec) { int bx0, bx1, by0, by1, b00, b10, b01, b11; float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v; - register int i, j; + int i, j; SETUP(vec.x(), bx0, bx1, rx0, rx1); SETUP(vec.y(), by0, by1, ry0, ry1); @@ -186,7 +186,7 @@ float Noise::smoothNoise3(Vec3f& vec) { int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11; float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v; - register int i, j; + int i, j; SETUP(vec.x(), bx0, bx1, rx0, rx1); SETUP(vec.y(), by0, by1, ry0, ry1); diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index b4a3646edef..053015f459d 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -419,12 +419,7 @@ Stroke::Stroke(const Stroke& iBrother) _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; - } + _mtex[a] = iBrother._mtex[a]; } _nodeTree = iBrother._nodeTree; _tips = iBrother._tips; |