[Bf-blender-cvs] [1bebdfbebd2] greasepencil-object: GPencil: Fix missing line after merge

[Antonio Vazquez]

Commit: 1bebdfbebd2ef9ccfd079d6221ddebbc7debd19a
Author: Antonio Vazquez
Date:   Fri Mar 6 12:40:16 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1bebdfbebd2ef9ccfd079d6221ddebbc7debd19a

GPencil: Fix missing line after merge

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

M	source/blender/blenkernel/intern/object.c

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 6a22b312779..4ac98739357 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1041,6 +1041,10 @@ static void object_init(Object *ob, const short ob_type)
     ob->trackflag = OB_NEGZ;
     ob->upflag = OB_POSY;
   }
+
+  if (ob->type == OB_GPENCIL) {
+    ob->dtx |= OB_USE_GPENCIL_LIGHTS;
+  }
 }
 
 void *BKE_object_obdata_add_from_type(Main *bmain, int type, const char *name)