Fix T101888: Curves editmode: modifiers "Display in Edit mode" no effect
Add the eModifierMode_Editmode to the required modes for curves modifier evaluation. Only this way the modifier can be skipped in evaluation. Maniphest Tasks: T101888 Differential Revision: https://developer.blender.org/D16280
This commit is contained in:
parent
2180e6fc9f
commit
b51763a773
Notes:
blender-bot
2023-02-14 08:06:38 +01:00
Referenced by issue #101888, Curves editmode: modifiers "Display modifier in Edit mode" option has no effect
|
@ -287,7 +287,10 @@ static void curves_evaluate_modifiers(struct Depsgraph *depsgraph,
|
|||
{
|
||||
/* Modifier evaluation modes. */
|
||||
const bool use_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
|
||||
const int required_mode = use_render ? eModifierMode_Render : eModifierMode_Realtime;
|
||||
int required_mode = use_render ? eModifierMode_Render : eModifierMode_Realtime;
|
||||
if (BKE_object_is_in_editmode(object)) {
|
||||
required_mode = (ModifierMode)(int(required_mode) | eModifierMode_Editmode);
|
||||
}
|
||||
ModifierApplyFlag apply_flag = use_render ? MOD_APPLY_RENDER : MOD_APPLY_USECACHE;
|
||||
const ModifierEvalContext mectx = {depsgraph, object, apply_flag};
|
||||
|
||||
|
|
|
@ -1902,6 +1902,7 @@ bool BKE_object_is_in_editmode(const Object *ob)
|
|||
/* Grease Pencil object has no edit mode data. */
|
||||
return GPENCIL_EDIT_MODE((bGPdata *)ob->data);
|
||||
case OB_CURVES:
|
||||
/* Curves object has no edit mode data. */
|
||||
return ob->mode == OB_MODE_EDIT;
|
||||
default:
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue