[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15031] trunk/blender/source/blender/ blenkernel/intern/object.c:

[Brecht Van Lommel]

Revision: 15031
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15031
Author:   blendix
Date:     2008-05-28 20:11:45 +0200 (Wed, 28 May 2008)

Log Message:
-----------

Fix for bug #13224: vertex parenting didn't work correct with
multiple unconnected curves.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c     2008-05-28 
17:55:06 UTC (rev 15030)
+++ trunk/blender/source/blender/blenkernel/intern/object.c     2008-05-28 
18:11:45 UTC (rev 15031)
@@ -1614,7 +1614,7 @@
                        
                        for(eve= em->verts.first; eve; eve= eve->next) {
                                if(eve->keyindex==nr) {
-                                       memcpy(vec, eve->co, 12);
+                                       memcpy(vec, eve->co, sizeof(float)*3);
                                        break;
                                }
                        }
@@ -1652,18 +1652,20 @@
                Curve *cu;
                BPoint *bp;
                BezTriple *bezt;
+               int found= 0;
                
                cu= par->data;
                nu= cu->nurb.first;
                if(par==G.obedit) nu= editNurb.first;
                
                count= 0;
-               while(nu) {
+               while(nu && !found) {
                        if((nu->type & 7)==CU_BEZIER) {
                                bezt= nu->bezt;
                                a= nu->pntsu;
                                while(a--) {
                                        if(count==nr) {
+                                               found= 1;
                                                VECCOPY(vec, bezt->vec[1]);
                                                break;
                                        }
@@ -1676,7 +1678,8 @@
                                a= nu->pntsu*nu->pntsv;
                                while(a--) {
                                        if(count==nr) {
-                                               memcpy(vec, bp->vec, 12);
+                                               found= 1;
+                                               memcpy(vec, bp->vec, 
sizeof(float)*3);
                                                break;
                                        }
                                        count++;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs