[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24791] trunk/blender: Repair display of iTaSC IK constraint.

[Benoit Bolsee]

Revision: 24791
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24791
Author:   ben2610
Date:     2009-11-22 23:42:57 +0100 (Sun, 22 Nov 2009)

Log Message:
-----------
Repair display of iTaSC IK constraint. Fix crash in GE with high priority action overwriting low priority action.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_object_constraint.py
    trunk/blender/source/blender/blenkernel/intern/action.c

Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py	2009-11-22 22:23:58 UTC (rev 24790)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py	2009-11-22 22:42:57 UTC (rev 24791)
@@ -159,7 +159,7 @@
     def IK(self, context, layout, con, wide_ui):
         if context.object.pose.ik_solver == "ITASC":
             layout.itemR(con, "ik_type")
-            getattr(self, 'IK_' + con.ik_type)(context, layout, con)
+            getattr(self, 'IK_' + con.ik_type)(context, layout, con, wide_ui)
         else:
             # Legacy IK constraint
             self.target_template(layout, con, wide_ui)

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2009-11-22 22:23:58 UTC (rev 24790)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2009-11-22 22:42:57 UTC (rev 24791)
@@ -629,7 +629,7 @@
 	pchan->flag= chan->flag;
 	
 	con= chan->constraints.first;
-	for(pcon= pchan->constraints.first; pcon; pcon= pcon->next, con= con->next) {
+	for(pcon= pchan->constraints.first; pcon && con; pcon= pcon->next, con= con->next) {
 		pcon->enforce= con->enforce;
 		pcon->headtail= con->headtail;
 	}