[Bf-blender-cvs] [e9e9934d1b0] greasepencil-refactor: Fix bug introduced in previous commit checking number of users
Antonio Vazquez
noreply at git.blender.org
Sat Jan 18 11:55:41 CET 2020
Commit: e9e9934d1b051250c087614d469512f33472da64
Author: Antonio Vazquez
Date: Thu Jan 16 10:09:00 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBe9e9934d1b051250c087614d469512f33472da64
Fix bug introduced in previous commit checking number of users
If the eval is not used for 1 user, the modifier is added again and again.
To avoid this eval, it would be required a flag to check if the modifier was applied before, but this need more work and we will do in the future.
===================================================================
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 7dee5b3bfc6..3991f4b0747 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -829,11 +829,10 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o
{
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)) && (gpd->id.us > 1));
+ (!GPENCIL_SIMPLIFY_MODIF(scene)));
if (!do_modifiers) {
return;
}
More information about the Bf-blender-cvs
mailing list