Merge branch 'soc-2019-openxr' into temp-vr-draw-threadtemp-vr-draw-thread

1 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index 79aafc6978f..0a5db782892 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -495,12 +495,16 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
                                         NULL,
                                         false,
                                         op->reports)) {
+
+        if (data_type == DT_TYPE_LNOR && use_create) {
+          ((Mesh *)ob_dst->data)->flag |= ME_AUTOSMOOTH;
+        }
+
+        DEG_id_tag_update(&ob_dst->id, ID_RECALC_GEOMETRY);
         changed = true;
       }
     }
 
-    DEG_id_tag_update(&ob_dst->id, ID_RECALC_GEOMETRY);
-
     if (reverse_transfer) {
       SWAP(Object *, ob_src, ob_dst);
     }