[Bf-blender-cvs] [da8e276b284] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: da8e276b284768867713ca7ffcb41dc18efdca2a
Author: Antonio Vazquez
Date:   Fri Oct 11 13:46:06 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBda8e276b284768867713ca7ffcb41dc18efdca2a

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 5acc177b200,9e0d3b7a419..eaa458c4608
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3930,36 -3928,9 +3927,40 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
 +
 +    {
 +      /* Initialize new grease pencil uv scale parameter. */
 +      if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "float", "uv_scale")) {
 +        for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
 +          for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 +            for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
 +              for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 +                gps->uv_scale = 1.0f;
 +              }
 +            }
 +          }
 +        }
 +      }
 +    }
 +
 +    {
 +      /* Enable by default affect position for grease pencil sculpt brushes. */
 +      if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Data", "int", "mode_flag")) {
 +        for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +          /* Sculpt brushes. */
 +          GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
 +          if (gset) {
 +            for (int i = 0; i < GP_SCULPT_TYPE_MAX; i++) {
 +              GP_Sculpt_Data *brush = &gset->brush[i];
 +              brush->mode_flag = GP_SCULPT_FLAGMODE_APPLY_POSITION;
 +            }
 +          }
 +        }
 +      }
 +    }
    }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
+   }
  }