[Bf-blender-cvs] [73e1107] temp_depsgraph_split_ubereval: Removed pointless conditional, function call is the same in both cases.

[Lukas Tönne]

Commit: 73e110793c6f681dfc2bc20baf3174ef3c890059
Author: Lukas Tönne
Date:   Tue Sep 22 16:49:28 2015 +0200
Branches: temp_depsgraph_split_ubereval
https://developer.blender.org/rB73e110793c6f681dfc2bc20baf3174ef3c890059

Removed pointless conditional, function call is the same in both cases.

===================================================================

M	source/blender/blenkernel/intern/object_update.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index f46e137..ff66c29 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -170,12 +170,8 @@ void BKE_object_eval_mesh(EvaluationContext *eval_ctx,
 #else
 	UNUSED_VARS(eval_ctx);
 #endif
-	if (em) {
-		makeDerivedMesh(scene, ob, em,  data_mask, false); /* was CD_MASK_BAREMESH */
-	}
-	else {
-		makeDerivedMesh(scene, ob, NULL, data_mask, false);
-	}
+	
+	makeDerivedMesh(scene, ob, em, data_mask, false);
 }
 
 void BKE_object_eval_armature(EvaluationContext *UNUSED(eval_ctx),