blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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
This commit is contained in:
Tamito Kajiyama 2014-05-08 18:42:03 +09:00
parent 56df85b227
commit 75d49b7f55
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/depsgraph.c
View File

@ -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;

6
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -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;