[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12434] trunk/blender/source/blender/ blenkernel/intern/armature.c: Bugfix: "exploding candy"

[Joe Eagar]

Yes I noticed that, it was scary :)

Joe

Joshua Leung wrote:
> Revision: 12434
>           http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12434
> Author:   aligorith
> Date:     2007-10-30 06:22:46 +0100 (Tue, 30 Oct 2007)
>
> Log Message:
> -----------
> Bugfix: "exploding candy"
>
> Missed a case where I converted set_constraint_target incorrectly. This resulted in mancandy "exploding" on loading proxy-linked mancandy files.
>
> Modified Paths:
> --------------
>     trunk/blender/source/blender/blenkernel/intern/armature.c
>
> Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/armature.c	2007-10-30 02:48:51 UTC (rev 12433)
> +++ trunk/blender/source/blender/blenkernel/intern/armature.c	2007-10-30 05:22:46 UTC (rev 12434)
> @@ -1264,8 +1264,8 @@
>  			
>  			/* constraints, set target ob pointer to own object */
>  			copy_constraints(&pchanw.constraints, &pchanp->constraints);
> -
> -			for(con= pchanw.constraints.first; con; con= con->next) {
> +			
> +			for (con= pchanw.constraints.first; con; con= con->next) {
>  				bConstraintTypeInfo *cti= constraint_get_typeinfo(con);
>  				ListBase targets = {NULL, NULL};
>  				bConstraintTarget *ct;
> @@ -1274,10 +1274,8 @@
>  					cti->get_constraint_targets(con, &targets);
>  					
>  					for (ct= targets.first; ct; ct= ct->next) {
> -						if (ct->tar == from) {
> +						if (ct->tar == from)
>  							ct->tar = ob;
> -							strcpy(ct->subtarget, "");
> -						}
>  					}
>  					
>  					if (cti->flush_constraint_targets)
> @@ -1286,7 +1284,7 @@
>  			}
>  			
>  			/* free stuff from current channel */
> -			if(pchan->path) MEM_freeN(pchan->path);
> +			if (pchan->path) MEM_freeN(pchan->path);
>  			free_constraints(&pchan->constraints);
>  			
>  			/* the final copy */
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
>