[Bf-blender-cvs] [3b706723acc] blender2.8: Depsgraph: Remove clear of legacy unused flag

[Sergey Sharybin]

Commit: 3b706723acce81c6e17aa61288cfd2cee8a2d02e
Author: Sergey Sharybin
Date:   Fri Dec 1 12:18:19 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB3b706723acce81c6e17aa61288cfd2cee8a2d02e

Depsgraph: Remove clear of legacy unused flag

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

M       source/blender/blenkernel/intern/armature_update.c
M       source/blender/blenkernel/intern/object_update.c
M       source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenkernel/intern/armature_update.c 
b/source/blender/blenkernel/intern/armature_update.c
index 155967c7bd2..1b8bf3feb10 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -700,8 +700,6 @@ void BKE_pose_eval_flush(const struct EvaluationContext 
*UNUSED(eval_ctx),
 
        /* 6. release the IK tree */
        BIK_release_tree(scene, ob, ctime);
-
-       ob->recalc &= ~OB_RECALC_ALL;
 }
 
 void BKE_pose_eval_proxy_copy(const struct EvaluationContext 
*UNUSED(eval_ctx), Object *ob)
@@ -712,8 +710,4 @@ void BKE_pose_eval_proxy_copy(const struct 
EvaluationContext *UNUSED(eval_ctx),
                printf("Proxy copy error, lib Object: %s proxy Object: %s\n",
                       ob->id.name + 2, ob->proxy_from->id.name + 2);
        }
-       /* Rest of operations are NO-OP in depsgraph, so can clear
-        * flag now.
-        */
-       ob->recalc &= ~OB_RECALC_ALL;
 }
diff --git a/source/blender/blenkernel/intern/object_update.c 
b/source/blender/blenkernel/intern/object_update.c
index f5f521e119d..71d8c1981af 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -299,10 +299,6 @@ bool BKE_object_eval_proxy_copy(const EvaluationContext 
*UNUSED(eval_ctx),
 void BKE_object_eval_uber_transform(const EvaluationContext *eval_ctx, Object 
*object)
 {
        BKE_object_eval_proxy_copy(eval_ctx, object);
-       object->recalc &= ~(OB_RECALC_OB | OB_RECALC_TIME);
-       if (object->data == NULL) {
-               object->recalc &= ~OB_RECALC_DATA;
-       }
 }
 
 void BKE_object_eval_uber_data(const EvaluationContext *eval_ctx,
@@ -381,8 +377,6 @@ void BKE_object_eval_uber_data(const EvaluationContext 
*eval_ctx,
 #endif
                }
        }
-
-       ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME);
 }
 
 void BKE_object_eval_cloth(const EvaluationContext *UNUSED(eval_ctx),
diff --git a/source/blender/blenloader/intern/readfile.c 
b/source/blender/blenloader/intern/readfile.c
index 2d885fcec17..5d170960158 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5509,11 +5509,6 @@ static void direct_link_object(FileData *fd, Object *ob)
        /* weak weak... this was only meant as draw flag, now is used in 
give_base_to_objects too */
        ob->flag &= ~OB_FROMGROUP;
 
-       /* This is a transient flag; clear in order to avoid unneeded object 
update pending from
-        * time when file was saved.
-        */
-       ob->recalc = 0;
-
        /* XXX This should not be needed - but seems like it can happen in some 
cases, so for now play safe... */
        ob->proxy_from = NULL;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs