[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31932] trunk/blender/source/blender: Two small bugfixes:

[Joshua Leung]

Revision: 31932
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31932
Author:   aligorith
Date:     2010-09-15 06:15:42 +0200 (Wed, 15 Sep 2010)

Log Message:
-----------
Two small bugfixes:
- A property used in an 'active' poll for UI code in the NLA Editor was missed during the RNA renaming madness, leading to error prints in the console

- For matrix blending code, 'fsize' arrays were being declared wrong size (4 elements long instead of 3).

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/math_matrix.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c

Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c	2010-09-15 03:45:33 UTC (rev 31931)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c	2010-09-15 04:15:42 UTC (rev 31932)
@@ -998,7 +998,7 @@
 void blend_m3_m3m3(float out[][3], float dst[][3], float src[][3], float srcweight)
 {
 	float squat[4], dquat[4], fquat[4];
-	float ssize[3], dsize[3], fsize[4];
+	float ssize[3], dsize[3], fsize[3];
 	float rmat[3][3], smat[3][3];
 	
 	mat3_to_quat(dquat,dst);
@@ -1020,7 +1020,7 @@
 void blend_m4_m4m4(float out[][4], float dst[][4], float src[][4], float srcweight)
 {
 	float squat[4], dquat[4], fquat[4];
-	float ssize[3], dsize[3], fsize[4];
+	float ssize[3], dsize[3], fsize[3];
 	float sloc[3], dloc[3], floc[3];
 	
 	mat4_to_quat(dquat,dst);

Modified: trunk/blender/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2010-09-15 03:45:33 UTC (rev 31931)
+++ trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2010-09-15 04:15:42 UTC (rev 31932)
@@ -309,7 +309,7 @@
 		
 	/* settings */
 	column= uiLayoutColumn(layout, 1);
-		uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "use_animated_time"))); 
+		uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "use_animated_influence") || RNA_boolean_get(&strip_ptr, "use_animated_time"))); 
 		uiItemL(column, "Playback Settings:", 0);
 		uiItemR(column, &strip_ptr, "mute", 0, NULL, 0);
 		uiItemR(column, &strip_ptr, "use_reverse", 0, NULL, 0);