[Bf-blender-cvs] [6ef909bdf97] greasepencil-refactor: Do not create eval data if users is 1
Antonio Vazquez
noreply at git.blender.org
Sat Jan 18 11:55:36 CET 2020
Commit: 6ef909bdf971a5eb108879b14d8b98622ae92c3c
Author: Antonio Vazquez
Date: Thu Jan 16 08:35:15 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB6ef909bdf971a5eb108879b14d8b98622ae92c3c
Do not create eval data if users is 1
If only one user, the default eval data is used and don't need a new copy
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 5c26eebdfd5..7dee5b3bfc6 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -828,15 +828,15 @@ static void gpencil_assign_object_eval(Object *object)
void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *ob)
{
bGPdata *gpd_eval = (bGPdata *)ob->data;
+ Object *ob_orig = (Object *)DEG_get_original_id(&ob->id);
+ bGPdata *gpd = (bGPdata *)ob_orig->data;
+
const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd_eval);
const bool do_modifiers = (bool)((!is_multiedit) && (ob->greasepencil_modifiers.first != NULL) &&
- (!GPENCIL_SIMPLIFY_MODIF(scene)));
-
+ (!GPENCIL_SIMPLIFY_MODIF(scene)) && (gpd->id.us > 1));
if (!do_modifiers) {
return;
}
-
- Object *ob_orig = (Object *)DEG_get_original_id(&ob->id);
DEG_debug_print_eval(depsgraph, __func__, gpd_eval->id.name, gpd_eval);
/* If first time, do a full copy. */
More information about the Bf-blender-cvs
mailing list