[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11289] trunk/blender/source/blender/ blenkernel/intern/anim.c: Bugfix #6831: Crash when combining duplivert and mirror

[Joshua Leung]

Revision: 11289
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11289
Author:   aligorith
Date:     2007-07-16 14:20:57 +0200 (Mon, 16 Jul 2007)

Log Message:
-----------
Bugfix #6831: Crash when combining duplivert and mirror

I've added checks which should prevent crashes in this case. Sometimes vertex_dupli__mapFunc is called with no_f being NULL, but no_s should not be NULL in those cases.

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

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c	2007-07-16 09:09:01 UTC (rev 11288)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2007-07-16 12:20:57 UTC (rev 11289)
@@ -384,9 +384,13 @@
 	VECCOPY(obmat[3], vec);
 	
 	if(vdd->par->transflag & OB_DUPLIROT) {
+		if(no_f) {
+			vec[0]= -no_f[0]; vec[1]= -no_f[1]; vec[2]= -no_f[2];
+		}
+		else if(no_s) {
+			vec[0]= -no_s[0]; vec[1]= -no_s[1]; vec[2]= -no_s[2];
+		}
 		
-		vec[0]= -no_f[0]; vec[1]= -no_f[1]; vec[2]= -no_f[2];
-		
 		q2= vectoquat(vec, vdd->ob->trackflag, vdd->ob->upflag);
 		
 		QuatToMat3(q2, mat);