[Bf-blender-cvs] [a3cf97e] master: Fix T4068787 Cycles Bake Selected To Active From Non-Mesh Object Fails With Error

[Dalai Felinto]

Commit: a3cf97e2aa28b7d916cdcb8b5c85f7926a5e3fce
Author: Dalai Felinto
Date:   Wed Jun 18 19:18:52 2014 -0300
https://developer.blender.org/rBa3cf97e2aa28b7d916cdcb8b5c85f7926a5e3fce

Fix T4068787 Cycles Bake Selected To Active From Non-Mesh Object Fails With Error

Users can now bake from Mesh, Font, Curve, Surface and Metaballs.
Fix to include in 2.71

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

M	source/blender/editors/object/object_bake_api.c

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 582ecf0..9e2d6d9 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -372,8 +372,8 @@ static bool bake_objects_check(Main *bmain, Object *ob, ListBase *selected_objec
 			if (ob_iter == ob)
 				continue;
 
-			if (ob_iter->type != OB_MESH) {
-				BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is not a mesh", ob_iter->id.name + 2);
+			if (ELEM5(ob_iter->type, OB_MESH, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL) == false) {
+				BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is not a mesh or can't be converted to a mesh (Curve, Text, Surface or Metaball)", ob_iter->id.name + 2);
 				return false;
 			}
 			tot_objects += 1;