[Bf-blender-cvs] [4326d162ba8] master: GPencil: Enable Lights ON to default object in 2D template

Antonio Vazquez noreply at git.blender.org
Fri Mar 13 13:06:06 CET 2020


Commit: 4326d162ba8cdefd2a216d03abd4fe0509485f86
Author: Antonio Vazquez
Date:   Fri Mar 13 13:05:24 2020 +0100
Branches: master
https://developer.blender.org/rB4326d162ba8cdefd2a216d03abd4fe0509485f86

GPencil: Enable Lights ON to default object in 2D template

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

M	source/blender/blenloader/intern/versioning_defaults.c

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

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index f0127330b1b..53c63ef980b 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -627,7 +627,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
       BKE_id_delete(bmain, brush);
     }
 
-    /* Rename and fix materials. */
+    /* Rename and fix materials and enable default object lights on. */
     if (app_template && STREQ(app_template, "2D_Animation")) {
       Material *ma = NULL;
       rename_id_for_versioning(bmain, ID_MA, "Black", "Solid Stroke");
@@ -654,6 +654,11 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
       if (ma != NULL) {
         ma->gp_style->flag &= ~GP_MATERIAL_STROKE_SHOW;
       }
+
+      Object *ob = BLI_findstring(&bmain->objects, "Stroke", offsetof(ID, name) + 2);
+      if (ob && ob->type == OB_GPENCIL) {
+        ob->dtx |= OB_USE_GPENCIL_LIGHTS;
+      }
     }
 
     /* Reset all grease pencil brushes. */



More information about the Bf-blender-cvs mailing list