[Bf-blender-cvs] [f8c247f] master: Remove the code which checked whether early object update skip didn't fail

Sergey Sharybin noreply at git.blender.org
Mon Mar 24 10:16:35 CET 2014


Commit: f8c247f21b8e489750e3847a4a2270c1146cbbc2
Author: Sergey Sharybin
Date:   Mon Mar 24 15:15:43 2014 +0600
https://developer.blender.org/rBf8c247f21b8e489750e3847a4a2270c1146cbbc2

Remove the code which checked whether early object update skip didn't fail

Was a safety check which never triggered, so likely could be removed now.

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index a00a8c4..28cc430 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1446,34 +1446,6 @@ static void scene_update_objects(EvaluationContext *eval_ctx, Main *bmain, Scene
 	 * BKE_object_handle_update() then we do nothing here.
 	 */
 	if (!scene_need_update_objects(bmain)) {
-		/* For debug builds we check whether early return didn't give
-		 * us any regressions in terms of missing updates.
-		 *
-		 * TODO(sergey): Remove once we're sure the check above is correct.
-		 */
-#ifndef NDEBUG
-		Base *base;
-
-		for (base = scene->base.first; base; base = base->next) {
-			Object *object = base->object;
-
-			BLI_assert((object->recalc & OB_RECALC_ALL) == 0);
-
-			if (object->proxy) {
-				BLI_assert((object->proxy->recalc & OB_RECALC_ALL) == 0);
-			}
-
-			if (object->dup_group && (object->transflag & OB_DUPLIGROUP)) {
-				GroupObject *go;
-				for (go = object->dup_group->gobject.first; go; go = go->next) {
-					if (go->ob) {
-						BLI_assert((go->ob->recalc & OB_RECALC_ALL) == 0);
-					}
-				}
-			}
-		}
-#endif
-
 		return;
 	}




More information about the Bf-blender-cvs mailing list