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

[Antonioya]

Commit: 097ae32e2b7fb2d0c7ba1e0d106a814c9304b438
Author: Antonioya
Date:   Wed Jul 10 17:12:31 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB097ae32e2b7fb2d0c7ba1e0d106a814c9304b438

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/object/object_add.c
index 22550e18dba,f8cf55933aa..077c56adafb
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@@ -2126,10 -2131,9 +2132,10 @@@ static Base *duplibase_for_convert
  static int convert_exec(bContext *C, wmOperator *op)
  {
    Main *bmain = CTX_data_main(C);
-   Depsgraph *depsgraph = CTX_data_depsgraph(C);
+   Depsgraph *depsgraph = CTX_data_evaluated_depsgraph(C);
    Scene *scene = CTX_data_scene(C);
    ViewLayer *view_layer = CTX_data_view_layer(C);
 +  View3D *v3d = CTX_wm_view3d(C);
    Base *basen = NULL, *basact = NULL;
    Object *ob1, *obact = CTX_data_active_object(C);
    Curve *cu;