Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-07-03 01:49:19 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-07-03 01:49:19 +0400
commit4e39a854b4589cddff484649d95cce4c71d4e9f4 (patch)
treed9c391d3caf3fcf6670caa12e254b00e84aa89d9 /source/blender/freestyle/intern/stroke/Stroke.cpp
parent6b2c3ed3a7dc44637f715f8f6180bc380f9d5529 (diff)
Fix for Stroke::Resample() in combination with the previous commit.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Stroke.cpp')
-rwxr-xr-xsource/blender/freestyle/intern/stroke/Stroke.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index 3675a6c0ce2..b42e673b4be 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -518,9 +518,9 @@ void Stroke::Resample(int iNPoints)
int nsegments = 0;
while(((it!=itend)&&(next!=itend)))
{
- Vec3r a((it)->point2d());
- Vec3r b((next)->point2d());
- Vec3r vec_tmp(b - a);
+ Vec2r a((it)->getPoint());
+ Vec2r b((next)->getPoint());
+ Vec2r vec_tmp(b - a);
real norm_var = vec_tmp.norm();
int numberOfPointsToAdd = (int)floor((iNPoints-strokeVerticesSize())*norm_var/_Length);
float csampling = norm_var/(float)(numberOfPointsToAdd+1);