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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-03-13 13:12:23 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-03-19 12:43:10 +0300
commit7e9575f7a16caa408102897ae8f14b6c61f9369c (patch)
treee7b9be7d7683f93f44d1367bcee7727101f46732 /source/blender/depsgraph
parentb49dbb635af74db5359cfc6c14a00ef397725968 (diff)
Fix T74701: Text on Curve Scaling Issue
Both scaling the text itself, as well as scaling the curve wasnt updating, now added relations for this. Maniphest Tasks: T74701 Differential Revision: https://developer.blender.org/D7140
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 5c45d3e126e..129b366adaa 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -785,6 +785,9 @@ void DepsgraphRelationBuilder::build_object_data(Object *object)
if (object->type == OB_FONT) {
Curve *curve = (Curve *)object->data;
if (curve->textoncurve) {
+ ComponentKey geometry_key((ID *)object->data, NodeType::GEOMETRY);
+ ComponentKey transform_key(&object->id, NodeType::TRANSFORM);
+ add_relation(transform_key, geometry_key, "Text on Curve own Transform");
add_special_eval_flag(&curve->textoncurve->id, DAG_EVAL_NEED_CURVE_PATH);
}
}
@@ -2100,8 +2103,10 @@ void DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata)
build_object(nullptr, cu->taperobj);
}
if (cu->textoncurve != nullptr) {
- ComponentKey textoncurve_key(&cu->textoncurve->id, NodeType::GEOMETRY);
- add_relation(textoncurve_key, obdata_geom_eval_key, "Text on Curve");
+ ComponentKey textoncurve_geom_key(&cu->textoncurve->id, NodeType::GEOMETRY);
+ add_relation(textoncurve_geom_key, obdata_geom_eval_key, "Text on Curve Geometry");
+ ComponentKey textoncurve_key(&cu->textoncurve->id, NodeType::TRANSFORM);
+ add_relation(textoncurve_key, obdata_geom_eval_key, "Text on Curve Transform");
build_object(nullptr, cu->textoncurve);
}
break;