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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-08 13:42:03 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-08 13:42:47 +0400
commit75d49b7f559aae2bcf85ac8666d87bf605adac8f (patch)
treef593b92dd64f8702a9ea64c26d47ebc468245e87 /source/blender/blenkernel/intern/depsgraph.c
parent56df85b227ff76a2ea3fefefb80db602749cd288 (diff)
Removed a Freestyle hack for DAG updates introduced in commit rBae58968e0a61.
Now that Freestyle employs a separate Main, this workaround is no longer necessary. Reviewers: sergey Reviewed By: sergey Differential Revision: https://developer.blender.org/D513
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 54709273c47..6533cd4aabe 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2589,12 +2589,7 @@ void DAG_ids_check_recalc(Main *bmain, Scene *scene, bool time)
/* we tag based on first ID type character to avoid
* looping over all ID's in case there are no tags */
- 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]])
+ if (id && bmain->id_tag_update[id->name[0]])
{
updated = true;
break;