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

[Antonio Vazquez]

Commit: 6a0ab6dbce3041c761b2a1226e02582c10b3d92d
Author: Antonio Vazquez
Date:   Wed Jan 15 08:36:55 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6a0ab6dbce3041c761b2a1226e02582c10b3d92d

Merge branch 'master' into greasepencil-object

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

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 77d96c7f088,d696aef76d4..2823953d917
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -1526,32 -1537,24 +1538,51 @@@ void do_versions_after_linking_280(Mai
      }
    }
  
 +  if (!MAIN_VERSION_ATLEAST(bmain, 282, 2)) {
 +    /* Init all Vertex/Sculpt and Weight Paint brushes. */
 +    Brush *brush = BLI_findstring(&bmain->brushes, "Pencil", offsetof(ID, name) + 2);
 +    for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +      ToolSettings *ts = scene->toolsettings;
 +
 +      BKE_brush_gpencil_vertex_presets(bmain, ts);
 +      BKE_brush_gpencil_sculpt_presets(bmain, ts);
 +      BKE_brush_gpencil_weight_presets(bmain, ts);
 +
 +      /* Ensure new Paint modes. */
 +      BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_GPENCIL);
 +      BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_VERTEX_GPENCIL);
 +      BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_SCULPT_GPENCIL);
 +      BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_WEIGHT_GPENCIL);
 +
 +      /* Set default Draw brush. */
 +      Paint *paint = &ts->gp_paint->paint;
 +      BKE_paint_brush_set(paint, brush);
 +      /* Enable cursor by default. */
 +      paint->flags |= PAINT_SHOW_BRUSH;
 +
 +      /* Ensure Palette by default. */
 +      BKE_gpencil_palette_ensure(bmain, scene);
 +    }
 +  }
++
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
+ 
+     /* During development of Blender 2.80 the "Object.hide" property was
+      * removed, and reintroduced in 5e968a996a53 as "Object.hide_viewport". */
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       BKE_fcurves_id_cb(&ob->id, do_version_fcurve_hide_viewport_fix, NULL);
+     }
+   }
  }
  
  /* NOTE: This version patch is intended for versions < 2.52.2,