[Bf-blender-cvs] [e910924b37a] soc-2019-npr: Merge remote-tracking branch 'origin/master' into soc-2019-npr

[YimingWu]

Commit: e910924b37a3fdffeb38ac14c656c16f107a9c0d
Author: YimingWu
Date:   Thu Oct 24 20:36:28 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBe910924b37a3fdffeb38ac14c656c16f107a9c0d

Merge remote-tracking branch 'origin/master' into soc-2019-npr

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index bcac531a72b,e885aa04881..9e1d6b6c428
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -2020,7 -1761,6 +2021,10 @@@ bool BKE_gpencil_shrink_stroke(bGPDstro
  bool BKE_gpencil_smooth_stroke(bGPDstroke *gps, int i, float inf)
  {
    bGPDspoint *pt = &gps->points[i];
++<<<<<<< HEAD
 +  /*  float pressure = 0.0f; */
++=======
++>>>>>>> origin/master
    float sco[3] = {0.0f};
  
    /* Do nothing if not enough points to smooth out */
diff --cc source/blender/editors/object/object_add.c
index 3d5ec3d4ed5,bdb23c5ce6f..716ff94bbae
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@@ -2144,9 -2144,8 +2144,10 @@@ static int convert_exec(bContext *C, wm
    Object *gpencil_ob = NULL;
    const short target = RNA_enum_get(op->ptr, "target");
    bool keep_original = RNA_boolean_get(op->ptr, "keep_original");
 +  const bool gpencil_lines = RNA_boolean_get(op->ptr, "gpencil_lines");
 +  const bool use_collections = RNA_boolean_get(op->ptr, "use_collections");
    int a, mballConverted = 0;
+   bool gpencilConverted = false;
  
    /* don't forget multiple users! */