diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-04 12:36:50 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-04 12:36:50 +0300 |
| commit | 5a6a819b5d896da6a528615bce069d6ee9d9c85c (patch) | |
| tree | bdbdc6f742ddda3f063df4655933d736a1644eef | |
| parent | 727aab5af414ed774226fa5ee77aeef2ca61b520 (diff) | |
| parent | 457dc8d12ca79247349aa3e76457a9f45e73026e (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index a4aed76ee5e..361787fa956 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -104,10 +104,10 @@ set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/6de971097c set(OPENCOLORIO_HASH c9de0fd98f26ce6f2e08d617ca68b8e4) set(LLVM_VERSION 3.4.2) -set(LLVM_URI http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz) +set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz) set(LLVM_HASH a20669f75967440de949ac3b1bad439c) -set(CLANG_URI http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz) +set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz) set(CLANG_HASH 87945973b7c73038871c5f849a818588) set(OPENIMAGEIO_VERSION 1.7.15) diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 60dad141e0b..0b368df57ed 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -247,7 +247,6 @@ void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts) void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *userdef_b) { /* TODO: - * - keymaps * - various minor settings (add as needed). */ @@ -263,10 +262,6 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use SWAP(ListBase, userdef_a->id, userdef_b->id); \ } ((void)0) - /* for some types we need custom free functions */ - LIST_SWAP(addons); - LIST_SWAP(user_keymaps); - LIST_SWAP(uistyles); LIST_SWAP(uifonts); LIST_SWAP(themes); @@ -277,6 +272,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use DATA_SWAP(font_path_ui); DATA_SWAP(font_path_ui_mono); + DATA_SWAP(keyconfigstr); DATA_SWAP(manipulator_flag); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 79b63f36b76..4b578ba389e 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6135,8 +6135,10 @@ int join_curve_exec(bContext *C, wmOperator *op) cu = ob->data; BLI_movelisttolist(&cu->nurb, &tempbase); - /* Account for mixed 2D/3D curves when joining */ - BKE_curve_curve_dimension_update(cu); + if (ob->type == OB_CURVE) { + /* Account for mixed 2D/3D curves when joining */ + BKE_curve_curve_dimension_update(cu); + } DEG_relations_tag_update(bmain); // because we removed object(s), call before editmode! |