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
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-09-16 17:28:06 +0400
committerTon Roosendaal <ton@blender.org>2006-09-16 17:28:06 +0400
commita200194b8b17edfd6f734a0f21bc98865fcadaaf (patch)
treeeebd38774c3a79b045eb79cfcceb142b6ebed2bc /source
parente0fcfdb395b9227824080645413440c71b2472a4 (diff)
Vertex Parent fix: it gives error if you select > 3 points now.
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/editobject.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index c8301f07ec8..e831b98ebac 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -1076,7 +1076,7 @@ void make_vertex_parent(void)
BezTriple *bezt;
BPoint *bp;
Object *par, *ob;
- int a, v1=0, v2=0, v3=0, nr=1;
+ int a, v1=0, v2=0, v3=0, v4=0, nr=1;
/* we need 1 to 3 selected vertices */
@@ -1087,6 +1087,7 @@ void make_vertex_parent(void)
if(v1==0) v1= nr;
else if(v2==0) v2= nr;
else if(v3==0) v3= nr;
+ else if(v4==0) v4= nr;
else break;
}
nr++;
@@ -1105,6 +1106,7 @@ void make_vertex_parent(void)
if(v1==0) v1= nr;
else if(v2==0) v2= nr;
else if(v3==0) v3= nr;
+ else if(v4==0) v4= nr;
else break;
}
nr++;
@@ -1119,6 +1121,7 @@ void make_vertex_parent(void)
if(v1==0) v1= nr;
else if(v2==0) v2= nr;
else if(v3==0) v3= nr;
+ else if(v4==0) v4= nr;
else break;
}
nr++;
@@ -1137,6 +1140,7 @@ void make_vertex_parent(void)
if(v1==0) v1= nr;
else if(v2==0) v2= nr;
else if(v3==0) v3= nr;
+ else if(v4==0) v4= nr;
else break;
}
nr++;
@@ -1144,7 +1148,7 @@ void make_vertex_parent(void)
}
}
- if( !(v1 && v2==0 && v3==0) && !(v1 && v2 && v3) ) {
+ if(v4 || !((v1 && v2==0 && v3==0) || (v1 && v2 && v3)) ) {
error("Select either 1 or 3 vertices to parent to");
return;
}