diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2014-06-19 02:18:52 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2014-06-19 02:20:46 +0400 |
| commit | a3cf97e2aa28b7d916cdcb8b5c85f7926a5e3fce (patch) | |
| tree | fed08efd518b5ad5b76789398f8b0d8ac8bceede /source/blender/editors/object/object_bake_api.c | |
| parent | 1ef5669ad774ac98fff7359132f08c2f7c923643 (diff) | |
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
Diffstat (limited to 'source/blender/editors/object/object_bake_api.c')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 582ecf09ece..9e2d6d95f38 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; |