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

[Antonio Vazquez]

Commit: 0e8e0e320315d89145a3c6c292a9d8794bafae5e
Author: Antonio Vazquez
Date:   Sat Nov 30 11:49:38 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0e8e0e320315d89145a3c6c292a9d8794bafae5e

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/versioning_280.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 6f5d12943f7,6c8b14ad5c7..f367a70b34a
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4226,55 -4235,38 +4211,89 @@@ void blo_do_versions_280(FileData *fd, 
        }
      }
  
+     /* Make markers region visible by default. */
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+         for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
+           switch (sl->spacetype) {
+             case SPACE_SEQ: {
+               SpaceSeq *sseq = (SpaceSeq *)sl;
+               sseq->flag |= SEQ_SHOW_MARKERS;
+               break;
+             }
+             case SPACE_ACTION: {
+               SpaceAction *saction = (SpaceAction *)sl;
+               saction->flag |= SACTION_SHOW_MARKERS;
+               break;
+             }
+             case SPACE_GRAPH: {
+               SpaceGraph *sipo = (SpaceGraph *)sl;
+               sipo->flag |= SIPO_SHOW_MARKERS;
+               break;
+             }
+             case SPACE_NLA: {
+               SpaceNla *snla = (SpaceNla *)sl;
+               snla->flag |= SNLA_SHOW_MARKERS;
+               break;
+             }
+           }
+         }
+       }
+     }
+   }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
++
 +    /* Init new Grease Pencil Paint tools. */
 +    {
 +      for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
 +        if (brush->gpencil_settings != NULL) {
 +          brush->gpencil_vertex_tool = brush->gpencil_settings->brush_type;
 +        }
 +      }
 +
 +      for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
 +        if (brush->gpencil_settings != NULL) {
 +          brush->gpencil_sculpt_tool = brush->gpencil_settings->brush_type;
 +        }
 +      }
 +
 +      for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
 +        if (brush->gpencil_settings != NULL) {
 +          brush->gpencil_weight_tool = brush->gpencil_settings->brush_type;
 +        }
 +      }
 +
 +      BKE_paint_toolslots_init_from_main(bmain);
 +    }
 +
 +    /* Init default Vertex paint mix factor for Viewport. */
 +    {
 +      if (!DNA_struct_elem_find(
 +              fd->filesdna, "View3DOverlay", "float", "gpencil_vertex_paint_opacity")) {
 +        for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +          for (ScrArea *area = screen->areabase.first; area; area = area->next) {
 +            for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
 +              if (sl->spacetype == SPACE_VIEW3D) {
 +                View3D *v3d = (View3D *)sl;
 +                v3d->overlay.gpencil_vertex_paint_opacity = 1.0f;
 +              }
 +            }
 +          }
 +        }
 +      }
 +    }
 +
 +    /* Init default Vertex paint layer mix factor. */
 +    {
 +      if (!DNA_struct_elem_find(fd->filesdna, "bGPDlayer", "float", "vertex_paint_opacity")) {
 +        for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
 +          for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 +            gpl->vertex_paint_opacity = 1.0f;
 +          }
 +        }
 +      }
 +    }
    }
  }