diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-08 13:43:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-08 13:43:37 +0300 |
| commit | 127d515f3d3309b4b9311978b0bcddaa28c65cf5 (patch) | |
| tree | ccd8e445ab439d0650c557f62a92fe804beac48b | |
| parent | 345c6298e995ea618c34282ba6d7ab5af032f191 (diff) | |
| parent | 1ddd03b793f6856a1278f3d8a32baca318896dfe (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | release/freedesktop/org.blender.Blender.appdata.xml | 42 | ||||
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 |
2 files changed, 43 insertions, 3 deletions
diff --git a/release/freedesktop/org.blender.Blender.appdata.xml b/release/freedesktop/org.blender.Blender.appdata.xml new file mode 100644 index 00000000000..d71dcb3719b --- /dev/null +++ b/release/freedesktop/org.blender.Blender.appdata.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <id>org.blender.Blender</id> + <launchable type="desktop">blender.desktop</launchable> + <name>Blender</name> + <summary>Free and open source 3D creation suite</summary> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-3.0</project_license> + <description> + <p> + Blender is the free and open source 3D creation suite. It supports + the entirety of the 3D pipeline—modeling, rigging, animation, + simulation, rendering, compositing and motion tracking, even video + editing and game creation. + </p> + + <p> + Advanced users employ Blender’s API for Python scripting to + customize the application and write specialized tools. Blender is + well suited to individuals and small studios who benefit from its + unified pipeline and responsive development process. + </p> + </description> + <url type="homepage">http://www.blender.org</url> + <url type="help">https://www.blender.org/support/</url> + <url type="bugtracker">https://developer.blender.org</url> + <url type="donation">https://www.blender.org/foundation/donation-payment/</url> + <screenshots> + <screenshot type="default"> + <image>https://download.blender.org/demo/screenshots/blender_screenshot_1.jpg</image> + </screenshot> + <screenshot> + <image>https://download.blender.org/demo/screenshots/blender_screenshot_2.jpg</image> + </screenshot> + <screenshot> + <image>https://download.blender.org/demo/screenshots/blender_screenshot_3.jpg</image> + </screenshot> + <screenshot> + <image>https://download.blender.org/demo/screenshots/blender_screenshot_4.jpg</image> + </screenshot> + </screenshots> +</component> diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 50922be76eb..c8bcc9224e9 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -623,9 +623,7 @@ static size_t initialize_internal_images(BakeImages *bake_images, ReportList *re /* create new mesh with edit mode changes and modifiers applied */ static Mesh *bake_mesh_new_from_object(EvaluationContext *eval_ctx, Main *bmain, Scene *scene, Object *ob) { - if (eval_ctx->object_mode & OB_MODE_EDIT) { - ED_object_editmode_load(ob); - } + ED_object_editmode_load(ob); Mesh *me = BKE_mesh_new_from_object(eval_ctx, bmain, scene, ob, 1, 2, 0, 0); if (me->flag & ME_AUTOSMOOTH) { |