diff options
author | Joshua Leung <aligorith@gmail.com> | 2010-09-15 08:15:42 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2010-09-15 08:15:42 +0400 |
commit | d2a12182102aecb9a3d4987dd126776f4d560a55 (patch) | |
tree | 78e57a33fd393d60352c92c2fd794626bfd98f85 | |
parent | a3470be1bc16ca1220261a2174538da6f1647bb0 (diff) |
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).
-rw-r--r-- | source/blender/blenlib/intern/math_matrix.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index 64c3e746982..3b5ffa2d442 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -998,7 +998,7 @@ void rotate_m4(float mat[][4], const char axis, const float angle) 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_m3_m3m3(float out[][3], float dst[][3], float src[][3], float srcweig 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); diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index fc869c4b46f..a728cc900c2 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -309,7 +309,7 @@ static void nla_panel_properties(const bContext *C, Panel *pa) /* 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); |