[Bf-blender-cvs] [f426d3a0028] soc-2019-openxr: Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

[Julian Eisel]

Commit: f426d3a00282650dc2976cd3cc1bf3a7439024b6
Author: Julian Eisel
Date:   Wed Nov 27 15:25:12 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBf426d3a00282650dc2976cd3cc1bf3a7439024b6

Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 90f4268940f,8a3ec61bbc8..49d3726a224
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3940,18 -3939,43 +3941,57 @@@ void blo_do_versions_280(FileData *fd, 
        }
      }
  
+     /* Add custom curve profile to toolsettings for bevel tool */
+     if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "CurveProfile", "custom_profile")) {
+       for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+         ToolSettings *ts = scene->toolsettings;
+         if ((ts) && (ts->custom_bevel_profile_preset == NULL)) {
+           ts->custom_bevel_profile_preset = BKE_curveprofile_add(PROF_PRESET_LINE);
+         }
+       }
+     }
+ 
+     /* Add custom curve profile to bevel modifier */
+     if (!DNA_struct_elem_find(fd->filesdna, "BevelModifier", "CurveProfile", "custom_profile")) {
+       for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+         for (ModifierData *md = object->modifiers.first; md; md = md->next) {
+           if (md->type == eModifierType_Bevel) {
+             BevelModifierData *bmd = (BevelModifierData *)md;
+             if (!bmd->custom_profile) {
+               bmd->custom_profile = BKE_curveprofile_add(PROF_PRESET_LINE);
+             }
+           }
+         }
+       }
+     }
+ 
+     /* Dash Ratio and Dash Samples */
+     if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "dash_ratio")) {
+       for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+         br->dash_ratio = 1.0f;
+         br->dash_samples = 20;
+       }
+     }
+ 
+     /* Pose brush smooth iterations */
+     if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "pose_smooth_itereations")) {
+       for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+         br->pose_smooth_iterations = 4;
+       }
+     }
++
 +#ifdef WITH_OPENXR
 +    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;
 +      }
 +    }
 +#endif
    }
  }
diff --cc source/blender/makesdna/intern/makesdna.c
index 508c90adf47,f4bc79b786a..b131b1cce93
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@@ -131,7 -131,7 +131,8 @@@ static const char *includefiles[] = 
      "DNA_layer_types.h",
      "DNA_workspace_types.h",
      "DNA_lightprobe_types.h",
+     "DNA_curveprofile_types.h",
 +    "DNA_xr_types.h",
  
      /* see comment above before editing! */
  
@@@ -1591,7 -1592,7 +1593,8 @@@ int main(int argc, char **argv
  #include "DNA_layer_types.h"
  #include "DNA_workspace_types.h"
  #include "DNA_lightprobe_types.h"
+ #include "DNA_curveprofile_types.h"
 +#include "DNA_xr_types.h"
  
  /* end of list */