[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59834] branches/soc-2013-depsgraph_mt/ source/blender/blenkernel/intern/object.c: Disable render constraints evaluation for now

[Sergey Sharybin]

Revision: 59834
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59834
Author:   nazgul
Date:     2013-09-05 12:23:33 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Disable render constraints evaluation for now

This is needed to prevent possible regressions caused
by viewport/render conflict which are using the same
ob->obmat and be able to commit current work to SVN.

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c	2013-09-05 12:23:29 UTC (rev 59833)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c	2013-09-05 12:23:33 UTC (rev 59834)
@@ -2185,8 +2185,15 @@
 	/* solve constraints */
 	if (ob->constraints.first && !(ob->transflag & OB_NO_CONSTRAINTS)) {
 		bConstraintOb *cob;
-		
-		cob = BKE_constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT, for_render);
+
+		(void) for_render;  /* Currently unused. */
+
+		/* TODO(sergey): Mixing viewport/render evaluation leads to conflicts because
+		 *               of shared ob->obmat.
+		 *               To preserve regressions for now don't use render evaluation
+		 *               for now.
+		 */
+		cob = BKE_constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT, false);
 		BKE_solve_constraints(&ob->constraints, cob, ctime);
 		BKE_constraints_clear_evalob(cob);
 	}