forked from bartvdbraak/blender
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).
This commit is contained in:
parent
a3470be1bc
commit
d2a1218210
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user