diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-08 13:42:03 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-08 13:42:47 +0400 |
| commit | 75d49b7f559aae2bcf85ac8666d87bf605adac8f (patch) | |
| tree | f593b92dd64f8702a9ea64c26d47ebc468245e87 /source/blender | |
| parent | 56df85b227ff76a2ea3fefefb80db602749cd288 (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')
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 7 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 6 |
2 files changed, 3 insertions, 10 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; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 866d0596288..9a356f49be5 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -570,11 +570,9 @@ Object *BlenderStrokeRenderer::NewMesh() const char name[MAX_ID_NAME]; unsigned int mesh_id = get_stroke_mesh_id(); - /* XXX this is for later review, for now we start names with 27 (DEL) - to allow ignoring them in DAG_ids_check_recalc() */ - BLI_snprintf(name, MAX_ID_NAME, "%c0%08xOB", 27, mesh_id); + BLI_snprintf(name, MAX_ID_NAME, "0%08xOB", mesh_id); ob = BKE_object_add_only_object(freestyle_bmain, OB_MESH, name); - BLI_snprintf(name, MAX_ID_NAME, "%c0%08xME", 27, mesh_id); + BLI_snprintf(name, MAX_ID_NAME, "0%08xME", mesh_id); ob->data = BKE_mesh_add(freestyle_bmain, name); ob->lay = 1; |