[Bf-blender-cvs] [80b15a44b66] vr_scene_inspection: Merge branch 'soc-2019-openxr' into vr_scene_inspection

[Julian Eisel]

Commit: 80b15a44b66390915f357ed3876755d185aac5b3
Author: Julian Eisel
Date:   Tue Mar 10 18:25:20 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB80b15a44b66390915f357ed3876755d185aac5b3

Merge branch 'soc-2019-openxr' into vr_scene_inspection

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 3b1e2a74a89,b885950c581..32577e1f6a8
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4544,9 -4809,71 +4809,73 @@@ void blo_do_versions_280(FileData *fd, 
                                                V3D_OFSDRAW_SHOW_ANNOTATION);
          wm->xr.session_settings.clip_start = v3d_default->clip_start;
          wm->xr.session_settings.clip_end = v3d_default->clip_end;
 +
 +        wm->xr.session_settings.flag = XR_SESSION_USE_POSITION_TRACKING;
        }
      }
+ 
+     /* Alembic Transform Cache changed from local to world space. */
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       LISTBASE_FOREACH (bConstraint *, con, &ob->constraints) {
+         if (con->type == CONSTRAINT_TYPE_TRANSFORM_CACHE) {
+           con->ownspace = CONSTRAINT_SPACE_WORLD;
+         }
+       }
+     }
+ 
+     /* Boundary Edges Automasking. */
+     if (!DNA_struct_elem_find(
+             fd->filesdna, "Brush", "int", "automasking_boundary_edges_propagation_steps")) {
+       for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+         br->automasking_boundary_edges_propagation_steps = 1;
+       }
+     }
+ 
+     /* Corrective smooth modifier scale*/
+     if (!DNA_struct_elem_find(fd->filesdna, "CorrectiveSmoothModifierData", "float", "scale")) {
+       for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
+         for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+           if (md->type == eModifierType_CorrectiveSmooth) {
+             CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md;
+             csmd->scale = 1.0f;
+           }
+         }
+       }
+     }
+ 
+     /* Default Face Set Color. */
+     for (Mesh *me = bmain->meshes.first; me != NULL; me = me->id.next) {
+       if (me->totpoly > 0) {
+         int *face_sets = CustomData_get_layer(&me->pdata, CD_SCULPT_FACE_SETS);
+         if (face_sets) {
+           me->face_sets_color_default = abs(face_sets[0]);
+         }
+       }
+     }
+   }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - #do_versions_after_linking_280 in this file.
+    * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
+     if (!DNA_struct_find(fd->filesdna, "bXrSessionSettings")) {
+       for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) {
+         const View3D *v3d_default = DNA_struct_default_get(View3D);
+ 
+         wm->xr.session_settings.shading_type = OB_SOLID;
+         wm->xr.session_settings.draw_flags = (V3D_OFSDRAW_SHOW_GRIDFLOOR |
+                                               V3D_OFSDRAW_SHOW_ANNOTATION);
+         wm->xr.session_settings.clip_start = v3d_default->clip_start;
+         wm->xr.session_settings.clip_end = v3d_default->clip_end;
+       }
+     }
    }
  }
diff --cc source/blender/editors/space_view3d/view3d_gizmo_navigate.c
index af8f36459c9,422cba7c52e..b3f52e328c6
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
@@@ -305,25 -306,20 +305,24 @@@ static void WIDGETGROUP_navigate_draw_p
  
    if (show_navigate) {
      int icon_mini_slot = 0;
- 
 -    gz = navgroup->gz_array[GZ_INDEX_ZOOM];
 -    gz->matrix_basis[3][0] = roundf(co[0]);
 -    gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
 -    WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 +    if ((rv3d->viewlock & RV3D_LOCK_DOLLY) == 0) {
-       gz = navgroup->gz_array[GZ_INDEX_ZOOM];
-       gz->matrix_basis[3][0] = co[0];
-       gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
-       WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
++        gz = navgroup->gz_array[GZ_INDEX_ZOOM];
++        gz->matrix_basis[3][0] = roundf(co[0]);
++        gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
++        WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 +    }
  
 -    gz = navgroup->gz_array[GZ_INDEX_MOVE];
 -    gz->matrix_basis[3][0] = roundf(co[0]);
 -    gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
 -    WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 +    if ((rv3d->viewlock & RV3D_LOCK_LOCATION) == 0) {
-       gz = navgroup->gz_array[GZ_INDEX_MOVE];
-       gz->matrix_basis[3][0] = co[0];
-       gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
-       WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
++        gz = navgroup->gz_array[GZ_INDEX_MOVE];
++        gz->matrix_basis[3][0] = roundf(co[0]);
++        gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
++        WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 +    }
  
 -    if ((rv3d->viewlock & RV3D_LOCKED) == 0) {
 +    if ((rv3d->viewlock & RV3D_LOCK_ROTATION) == 0) {
        gz = navgroup->gz_array[GZ_INDEX_CAMERA];
 -      gz->matrix_basis[3][0] = roundf(co[0]);
 -      gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
 +      gz->matrix_basis[3][0] = co[0];
 +      gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
        WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
  
        if (navgroup->state.rv3d.is_camera == false) {