[Bf-blender-cvs] [a472a54] master: Fix compilation error with Freestyle after recent DAG changes

[Sergey Sharybin]

Commit: a472a544d339d5d131aaed9cf92ab513e1edcff4
Author: Sergey Sharybin
Date:   Mon Jul 7 16:29:04 2014 +0600
https://developer.blender.org/rBa472a544d339d5d131aaed9cf92ab513e1edcff4

Fix compilation error with Freestyle after recent DAG changes

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index cfa2dbe..3490bb9 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2909,7 +2909,7 @@ void BKE_object_handle_update_ex(EvaluationContext *eval_ctx,
 					uint64_t data_mask = scene->customdata_mask | CD_MASK_BAREMESH;
 #ifdef WITH_FREESTYLE
 					/* make sure Freestyle edge/face marks appear in DM for render (see T40315) */
-					if (eval_ctx->for_render) {
+					if (eval_ctx->mode != DAG_EVAL_VIEWPORT) {
 						data_mask |= CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE;
 					}
 #endif