[Bf-blender-cvs] [8cb55f8d167] master: Fix T71612: Viewport rotate doesn't work

[Campbell Barton]

Commit: 8cb55f8d1672de4b40ce9f5a6a4803a2779d7379
Author: Campbell Barton
Date:   Sun Nov 24 22:47:47 2019 +1100
Branches: master
https://developer.blender.org/rB8cb55f8d1672de4b40ce9f5a6a4803a2779d7379

Fix T71612: Viewport rotate doesn't work

Error in version patching.

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

M       source/blender/blenloader/intern/versioning_280.c
M       source/blender/blenloader/intern/versioning_userdef.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c 
b/source/blender/blenloader/intern/versioning_280.c
index 33a0da7457f..58a9f22c4bd 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3712,10 +3712,6 @@ void blo_do_versions_280(FileData *fd, Library 
*UNUSED(lib), Main *bmain)
   }
 
   if (!MAIN_VERSION_ATLEAST(bmain, 281, 3)) {
-    if (U.view_rotate_sensitivity_turntable == 0) {
-      U.view_rotate_sensitivity_turntable = DEG2RADF(0.4f);
-      U.view_rotate_sensitivity_trackball = 1.0f;
-    }
     for (bScreen *screen = bmain->screens.first; screen; screen = 
screen->id.next) {
       for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
         for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
diff --git a/source/blender/blenloader/intern/versioning_userdef.c 
b/source/blender/blenloader/intern/versioning_userdef.c
index 838bb9bb9c8..f20ef8a07b7 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -670,6 +670,10 @@ void BLO_version_defaults_userpref_blend(Main *bmain, 
UserDef *userdef)
    * Include next version bump.
    */
   {
+    if (userdef->view_rotate_sensitivity_turntable == 0.0f) {
+      userdef->view_rotate_sensitivity_turntable = DEG2RADF(0.4f);
+      userdef->view_rotate_sensitivity_trackball = 1.0f;
+    }
     /* pass */
   }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs