Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 Jan 2018 09:36:50 +0000 (10:36 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 Jan 2018 09:36:50 +0000 (10:36 +0100)
build_files/build_environment/cmake/versions.cmake
source/blender/blenkernel/intern/blender.c
source/blender/editors/curve/editcurve.c

index a4aed76ee5ee6b2496e72651673063fec0bbd6dd..361787fa9567c364b4fa57fe3859b81d6bdaeb5f 100644 (file)
@@ -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)
index 60dad141e0b2e0fa71e8e516df80293b19788871..0b368df57eddf3c11552d21ab0eb00f1fbf319fd 100644 (file)
@@ -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);
 
index 79b63f36b76358a32a273470046202ead8ed8575..4b578ba389ebc1f1f387cd5fc06f94ed368e2d59 100644 (file)
@@ -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!