diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-20 14:10:34 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-20 14:10:34 +0400 |
commit | 1b3fdc43095d8d0a7dff9adf5c93dbad81a85576 (patch) | |
tree | 7b02688ff8054fa74aadbad7fd2d627ee1f014ec /source/blender/blenkernel | |
parent | 2e01f38885906bc14cb5a50cfe474aa562929ef3 (diff) |
Followup for 1728c1e: we don't need to replace flags at all
Replacing the flags isn't thread safe and could lead to bi troubles.
Such things are to be handled by the dependency graph.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 7028798f1fc..ed396fb32e3 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -690,6 +690,8 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O if (ob->type == OB_FONT) { if (cu->textoncurve) { node2 = dag_get_node(dag, cu->textoncurve); + /* Text on curve requires path to be evaluated for the target curve. */ + node2->eval_flags |= DAG_EVAL_NEED_CURVE_PATH; dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Texture On Curve"); } } diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 377b3ef90e2..2f543dcbe09 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -865,11 +865,6 @@ makebreak: /* TEXT ON CURVE */ /* Note: Only OB_CURVE objects could have a path */ if (cu->textoncurve && cu->textoncurve->type == OB_CURVE) { - Curve *cucu = cu->textoncurve->data; - int oldflag = cucu->flag; - - cucu->flag |= (CU_PATH + CU_FOLLOW); - BLI_assert(cu->textoncurve->curve_cache != NULL); if (cu->textoncurve->curve_cache->path) { float distfac, imat[4][4], imat3[3][3], cmat[3][3]; @@ -967,7 +962,6 @@ makebreak: } } - cucu->flag = oldflag; } if (selboxes) { |