[Bf-blender-cvs] [9699b1dca27] soc-2019-bevel-profiles: Merge branch 'master' into soc-2019-bevel-profiles

[Hans Goudey]

Commit: 9699b1dca275d1dab4d4f966e8a3e80ee16214fd
Author: Hans Goudey
Date:   Mon Oct 14 13:51:55 2019 -0400
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rB9699b1dca275d1dab4d4f966e8a3e80ee16214fd

Merge branch 'master' into soc-2019-bevel-profiles

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 3c6daa72fb0,ec4246f5dba..b1e5a3fec00
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -183,8 -183,8 +183,9 @@@ set(SR
    intern/particle_system.c
    intern/pbvh.c
    intern/pbvh_bmesh.c
+   intern/pbvh_parallel.cc
    intern/pointcache.c
 +  intern/profile_widget.c
    intern/report.c
    intern/rigidbody.c
    intern/scene.c
diff --cc source/blender/blenloader/intern/versioning_280.c
index 354302739b7,9e0d3b7a419..4c49d6c1436
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3845,30 -3865,10 +3866,11 @@@ void blo_do_versions_280(FileData *fd, 
      }
    }
  
-   {
-     /* Versioning code until next subversion bump goes here. */
 +
-     /* Add custom profile widget to toolsettings for bevel tool */
-     if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "ProfileWidget", "prwdgt")) {
-       for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
-         ToolSettings *ts = scene->toolsettings;
-         if ((ts) && (ts->prwdgt == NULL)) {
-           ts->prwdgt = BKE_profilewidget_add(PROF_PRESET_LINE);
-         }
-       }
-     }
- 
-     /* Add custom profile widget to bevel modifier */
-     if (!DNA_struct_elem_find(fd->filesdna, "BevelModifier", "ProfileWidget", "prwdgt")) {
-       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->prwdgt) {
-               bmd->prwdgt = BKE_profilewidget_add(PROF_PRESET_LINE);
-             }
-           }
-         }
+   if (!MAIN_VERSION_ATLEAST(bmain, 281, 15)) {
+     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+       if (scene->toolsettings->snap_node_mode == SCE_SNAP_MODE_NODE_X) {
+         scene->toolsettings->snap_node_mode = SCE_SNAP_MODE_GRID;
        }
      }
  
@@@ -3929,4 -3929,8 +3931,32 @@@
        }
      }
    }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
++        
++    /* Add custom profile widget to toolsettings for bevel tool */
++    if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "ProfileWidget", "prwdgt")) {
++      for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
++        ToolSettings *ts = scene->toolsettings;
++        if ((ts) && (ts->prwdgt == NULL)) {
++          ts->prwdgt = BKE_profilewidget_add(PROF_PRESET_LINE);
++        }
++      }
++    }
++
++    /* Add custom profile widget to bevel modifier */
++    if (!DNA_struct_elem_find(fd->filesdna, "BevelModifier", "ProfileWidget", "prwdgt")) {
++      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->prwdgt) {
++              bmd->prwdgt = BKE_profilewidget_add(PROF_PRESET_LINE);
++            }
++          }
++        }
++      }
++    }
+   }
  }