Cleanup/simplification for BKE_modifier_get_evaluated_mesh_from_object

* Added BKE_object_get_evaluated_mesh, which can also be used outside of
Modifier context.
* BKE_modifier_get_evaluated_mesh_from_object is now a dummy wrapper
around BKE_object_get_evaluated_mesh, we do not need anything special
anymore for RENDER quality option, since this is supposed to be handled
at depsgraph level... Maybe we can get rid of it at some point, but kind
of like the idea of keeping it for now, sounds more consitent.

1 files changed, 5 insertions, 10 deletions

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 6201010d2aa..111968ba018 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -66,6 +66,7 @@
 #include "BKE_library_query.h"
 #include "BKE_mesh.h"
 #include "BKE_multires.h"
+#include "BKE_object.h"
 #include "BKE_DerivedMesh.h"
 
 /* may move these, only for modifier_path_relbase */
@@ -1216,14 +1217,8 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData *
  */
 Mesh *BKE_modifier_get_evaluated_mesh_from_object(const ModifierEvalContext *ctx, Object *ob)
 {
-	const ModifierApplyFlag flag = ctx->flag;
-	Object *ob_eval = DEG_get_evaluated_object(ctx->depsgraph, ob);
-
-	if (flag & MOD_APPLY_RENDER) {
-		/* TODO(sergey): Use proper derived render in the future. */
-		return ob_eval->mesh_evaluated;
-	}
-	else {
-		return ob_eval->mesh_evaluated;
-	}
+	/* Note: we do not care about RENDER setting here, since we get data from despgraph
+	 * (and render depsgraph shall be different from realtime one)
+	 */
+	return BKE_object_get_evaluated_mesh(ctx->depsgraph, ob);
 }