[Bf-blender-cvs] [363f18c8b58] master: Merge branch 'blender-v2.83-release'

[Antonio Vazquez]

Commit: 363f18c8b58dd2ba637aed171e75a346e86e7753
Author: Antonio Vazquez
Date:   Fri May 15 16:51:36 2020 +0200
Branches: master
https://developer.blender.org/rB363f18c8b58dd2ba637aed171e75a346e86e7753

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 07551f3ea2b,2d44da3c737..e32a40e1ad5
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -5192,6 -5055,25 +5192,15 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
 -  }
 -
 -  /** Repair files from duplicate brushes added to blend files, see: T76738. */
 -  if (!MAIN_VERSION_ATLEAST(bmain, 283, 17) ||
 -      ((bmain->versionfile == 290) && !MAIN_VERSION_ATLEAST(bmain, 290, 2))) {
 -    short id_codes[] = {ID_BR, ID_PAL};
 -    for (int i = 0; i < ARRAY_SIZE(id_codes); i++) {
 -      ListBase *lb = which_libbase(bmain, id_codes[i]);
 -      BKE_main_id_repair_duplicate_names_listbase(lb);
 -    }
+ 
+     /* Set Brush default color for grease pencil. */
+     LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+       if (brush->gpencil_settings) {
+         brush->rgb[0] = 0.498f;
+         brush->rgb[1] = 1.0f;
+         brush->rgb[2] = 0.498f;
+       }
+     }
    }
  
    /**
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index cb72553c68b,139e52254f4..309329e4649
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -1814,10 -1748,10 +1814,10 @@@ static void gp_init_drawing_brush(bCont
    /* if not exist, create a new one */
    if ((paint->brush == NULL) || (paint->brush->gpencil_settings == NULL)) {
      /* create new brushes */
-     BKE_brush_gpencil_paint_presets(bmain, ts);
+     BKE_brush_gpencil_paint_presets(bmain, ts, true);
      changed = true;
    }
 -  /* be sure curves are initializated */
 +  /* Be sure curves are initializated. */
    BKE_curvemapping_initialize(paint->brush->gpencil_settings->curve_sensitivity);
    BKE_curvemapping_initialize(paint->brush->gpencil_settings->curve_strength);
    BKE_curvemapping_initialize(paint->brush->gpencil_settings->curve_jitter);