[Bf-blender-cvs] [bf488402df3] temp-gpencil-eval: Fix error in previous commit
Antonio Vazquez
noreply at git.blender.org
Tue Jan 14 17:18:18 CET 2020
Commit: bf488402df3606583abc08ee1e28d7877efb70e0
Author: Antonio Vazquez
Date: Tue Jan 14 17:18:02 2020 +0100
Branches: temp-gpencil-eval
https://developer.blender.org/rBbf488402df3606583abc08ee1e28d7877efb70e0
Fix error in previous commit
The do_modifiers var was wrong
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index a64a2d38b84..ba76119a89e 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -864,8 +864,9 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o
{
bGPdata *gpd_eval = (bGPdata *)ob->data;
const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd_eval);
+ const bool do_modifiers = (bool)((!is_multiedit) && (ob->greasepencil_modifiers.first != NULL));
- if ((is_multiedit) || (ob->greasepencil_modifiers.first == NULL)) {
+ if (!do_modifiers) {
return;
}
@@ -931,7 +932,7 @@ void BKE_gpencil_modifiers_calc(Depsgraph *depsgraph, Scene *scene, Object *ob)
bGPdata *gpd = (bGPdata *)ob->data;
const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
const bool is_render = (bool)(DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
- const bool do_modifiers = (bool)((is_multiedit) || (ob->greasepencil_modifiers.first == NULL));
+ const bool do_modifiers = (bool)((!is_multiedit) && (ob->greasepencil_modifiers.first != NULL));
if (!do_modifiers) {
return;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 19956865520..9f256612068 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -808,6 +808,7 @@ void update_id_after_copy(const Depsgraph *depsgraph,
}
if (object_cow->type == OB_GPENCIL) {
BKE_gpencil_prepare_filling_data(object_orig);
+ BKE_gpencil_prepare_filling_data(object_cow);
BKE_gpencil_update_orig_pointers(object_orig, object_cow);
}
update_particles_after_copy(depsgraph, object_orig, object_cow);
More information about the Bf-blender-cvs
mailing list