[Bf-blender-cvs] [8118685a831] temp-nla-strip-alignment: - normalize qt before doing math on them - ensure strip alignment panel script loaded

[Wayde Moss]

Commit: 8118685a831a405e1c0d87629629ce4f93725f89
Author: Wayde Moss
Date:   Thu Dec 10 00:09:52 2020 -0500
Branches: temp-nla-strip-alignment
https://developer.blender.org/rB8118685a831a405e1c0d87629629ce4f93725f89

- normalize qt before doing math on them
- ensure strip alignment panel script loaded

===================================================================

M	release/scripts/startup/bl_ui/__init__.py
M	source/blender/blenkernel/intern/anim_sys.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 4fe848a420f..e782ff7bfe3 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -49,7 +49,7 @@ _modules = [
     "properties_mask_common",
     "properties_material",
     "properties_material_gpencil",
-    #"properties_nla",
+    "properties_nla",
     "properties_object",
     "properties_paint_common",
     "properties_grease_pencil_common",
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 7d44c61d516..0d5315cd8d5 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -3008,7 +3008,10 @@ static void nlaeval_snapshot_blend(PointerRNA *ptr,
             copy_qt_qt(upper_qt, c_upper->values);
             copy_qt_qt(lower_qt, c_lower->values);
 
-            float result_qt[4];
+            normalize_qt(upper_qt);
+            normalize_qt(lower_qt);
+
+                float result_qt[4];
             interp_qt_qtqt(result_qt, lower_qt, upper_qt, upper_influence);
 
             copy_qt_qt(c_lower->values, result_qt);