[Bf-blender-cvs] [7ceb688d7cf] temp-greasepencil-object-stacksplit: Remove references to Grease Pencil modifiers

Antonio Vazquez noreply at git.blender.org
Mon Jun 18 17:12:17 CEST 2018


Commit: 7ceb688d7cffa5ceaa54672a46116a16e322fe32
Author: Antonio Vazquez
Date:   Mon Jun 18 16:52:05 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB7ceb688d7cffa5ceaa54672a46116a16e322fe32

Remove references to Grease Pencil modifiers

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

M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 70f69108383..172ac31cc63 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -658,17 +658,6 @@ static int modifier_apply_obdata(ReportList *reports, Main *bmain, Depsgraph *de
 
 		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
-	else if (ob->type == OB_GPENCIL) {
-		if (ELEM(NULL, ob, ob->data)) {
-			return 0;
-		}
-		else if (mti->gp_bakeModifier == NULL) {
-			BKE_report(reports, RPT_ERROR, "Not implemented");
-			return 0;
-		}
-		mti->gp_bakeModifier(bmain, depsgraph, md, ob);
-		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
-	}
 	else {
 		BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
 		return 0;



More information about the Bf-blender-cvs mailing list