Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-07-07 14:29:04 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-07-07 14:29:04 +0400
commita472a544d339d5d131aaed9cf92ab513e1edcff4 (patch)
treea385bbefa0c160ff30b92249784201e87339148d /source/blender/blenkernel/intern/object.c
parent180a7acd41fa984bc22c6becaf9164d1d0f5ab42 (diff)
Fix compilation error with Freestyle after recent DAG changes
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index cfa2dbe0eff..3490bb9ffbd 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