Fix #131888: Text "Fast editing" disables fill in all modes
This commit is contained in:
@@ -644,10 +644,11 @@ void BKE_curve_calc_modifiers_pre(Depsgraph *depsgraph,
|
||||
static bool do_curve_implicit_mesh_conversion(const Curve *curve,
|
||||
ModifierData *first_modifier,
|
||||
const Scene *scene,
|
||||
const ModifierMode required_mode)
|
||||
const ModifierMode required_mode,
|
||||
const bool editmode)
|
||||
{
|
||||
/* Skip implicit filling and conversion to mesh when using "fast text editing". */
|
||||
if (curve->flag & CU_FAST) {
|
||||
if ((curve->flag & CU_FAST) && editmode) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -710,7 +711,9 @@ static blender::bke::GeometrySet curve_calc_modifiers_post(Depsgraph *depsgraph,
|
||||
pretessellatePoint->next;
|
||||
|
||||
blender::bke::GeometrySet geometry_set;
|
||||
if (ob->type == OB_SURF || do_curve_implicit_mesh_conversion(cu, md, scene, required_mode)) {
|
||||
if (ob->type == OB_SURF ||
|
||||
do_curve_implicit_mesh_conversion(cu, md, scene, required_mode, editmode))
|
||||
{
|
||||
Mesh *mesh = BKE_mesh_new_nomain_from_curve_displist(ob, dispbase);
|
||||
geometry_set.replace_mesh(mesh);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user