[Bf-blender-cvs] [f97d036468f] blender2.8: Depsgraph / Object update: Query data update flag from data itself
Sergey Sharybin
noreply at git.blender.org
Wed Dec 13 16:44:22 CET 2017
Commit: f97d036468fc09be500e0940d68e961269a0fb10
Author: Sergey Sharybin
Date: Wed Dec 13 16:25:01 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBf97d036468fc09be500e0940d68e961269a0fb10
Depsgraph / Object update: Query data update flag from data itself
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index bea9e3bdcac..717d395fc68 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2699,8 +2699,11 @@ void BKE_object_handle_update_ex(const EvaluationContext *eval_ctx,
RigidBodyWorld *rbw,
const bool do_proxy_update)
{
+ const ID *object_data = ob->data;
const bool recalc_object = (ob->id.tag & LIB_TAG_ID_RECALC) != 0;
- const bool recalc_data = (ob->id.tag & LIB_TAG_ID_RECALC_DATA) != 0;
+ const bool recalc_data =
+ (object_data != NULL) ? ((object_data->tag & LIB_TAG_ID_RECALC_ALL) != 0)
+ : 0;
if (!recalc_object && ! recalc_data) {
object_handle_update_proxy(eval_ctx, scene, ob, do_proxy_update);
return;
More information about the Bf-blender-cvs
mailing list