From 8ee1de2de3418ce66dde97c0aedbacc8a23d1698 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2013 04:53:23 +0000 Subject: text editor reload no-longer resets scroll & cursor - annoying when making tweaks to UI scripts. also restrict freestyle hack to WITH_FREESTYLE define. --- source/blender/blenkernel/intern/depsgraph.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/depsgraph.c') diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 0a4a15cca09..1bae4ec68cc 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2341,8 +2341,13 @@ void DAG_ids_check_recalc(Main *bmain, Scene *scene, int time) /* we tag based on first ID type character to avoid * looping over all ID's in case there are no tags */ - /* XXX very weak... added check for '27' to ignore freestyle added objects */ - if (id && id->name[2] > 27 && bmain->id_tag_update[id->name[0]]) { + if (id && +#ifdef WITH_FREESTYLE + /* XXX very weak... added check for '27' to ignore freestyle added objects */ + id->name[2] > 27 && +#endif + bmain->id_tag_update[id->name[0]]) + { updated = 1; break; } -- cgit v1.2.3