From 0083c69624d2ae3df511c2ed9ae9baced75394af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 25 Sep 2018 13:44:25 +1000 Subject: [PATCH 1/5] Missing from last commit --- source/blender/editors/mesh/editmesh_extrude.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index e381cfdbdea..1e5e279ef35 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -474,8 +474,9 @@ static int edbm_extrude_edges_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); BMEditMesh *em = BKE_editmesh_from_object(obedit); + const bool use_normal_flip = RNA_boolean_get(op->ptr, "use_normal_flip"); - edbm_extrude_edges_indiv(em, op, BM_ELEM_SELECT, false); + edbm_extrude_edges_indiv(em, op, BM_ELEM_SELECT, use_normal_flip); EDBM_update_generic(em, true, true); From 554b26cf88de613ac94121c652cfff45a8f03c88 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 25 Sep 2018 12:01:43 +0200 Subject: [PATCH 2/5] Fix T56912: bpy.data.masks.new() crashed I think there are two possible ways to fix that. 1. Make the name a required parameter. 2. Provide a default value. I choosed option 1 in this fix to be consistent with other .new functions. Also I think `RNA_def_string` instead of `RNA_def_string_file_path` should be used here. Looks like a copy-paste error. Reviewers: brecht Differential Revision: https://developer.blender.org/D3728 --- source/blender/makesrna/intern/rna_main_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 7d619254e07..f2249eb397d 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -1864,7 +1864,8 @@ void RNA_def_main_masks(BlenderRNA *brna, PropertyRNA *cprop) /* new func */ func = RNA_def_function(srna, "new", "rna_Main_mask_new"); RNA_def_function_ui_description(func, "Add a new mask with a given name to the main database"); - RNA_def_string_file_path(func, "name", NULL, MAX_ID_NAME - 2, "Mask", "Name of new mask data-block"); + parm = RNA_def_string(func, "name", NULL, MAX_ID_NAME - 2, "Mask", "Name of new mask data-block"); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); /* return type */ parm = RNA_def_pointer(func, "mask", "Mask", "", "New mask data-block"); RNA_def_function_return(func, parm); From 5960254045d94ab06976138f52bac7f5f301cace Mon Sep 17 00:00:00 2001 From: Michel Anders Date: Tue, 25 Sep 2018 15:04:10 +0200 Subject: [PATCH 3/5] Fix missing metaball capsule properties in properties editor. Differential Revision: https://developer.blender.org/D3726 --- release/scripts/startup/bl_ui/properties_data_metaball.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index dd62c4523b1..6ed5bb3c763 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -109,6 +109,7 @@ class DATA_PT_metaball_element(DataButtonsPanel, Panel): col = split.column(align=True) col.label(text="Settings:") col.prop(metaelem, "stiffness", text="Stiffness") + col.prop(metaelem, "radius", text="Radius") col.prop(metaelem, "use_negative", text="Negative") col.prop(metaelem, "hide", text="Hide") @@ -120,7 +121,7 @@ class DATA_PT_metaball_element(DataButtonsPanel, Panel): col.prop(metaelem, "size_y", text="Y") col.prop(metaelem, "size_z", text="Z") - elif metaelem.type == 'TUBE': + elif metaelem.type == 'CAPSULE': col.label(text="Size:") col.prop(metaelem, "size_x", text="X") From d95a8988ea031a8d92a9e140b5a1dfcd6a5562da Mon Sep 17 00:00:00 2001 From: Alan Troth Date: Tue, 25 Sep 2018 18:29:56 +0200 Subject: [PATCH 4/5] Fix UV edit smart stitch not redoing correctly. Differential Revision: https://developer.blender.org/D3687 --- source/blender/editors/uvedit/uvedit_smart_stitch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 9699d74c86b..869009d1bdf 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -2002,6 +2002,7 @@ static void stitch_exit(bContext *C, wmOperator *op, int finished) RNA_enum_set(op->ptr, "stored_mode", state->mode); /* Store selection for re-execution of stitch */ + RNA_collection_clear(op->ptr, "selection"); for (i = 0; i < state->selection_size; i++) { UvElement *element; PointerRNA itemptr; From fcf3aa90daed0dde8c770857990f92c6601f8096 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 25 Sep 2018 11:05:01 -0600 Subject: [PATCH 5/5] CMake: Repress deprecation warnings with MSVC. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91a79af8141..c51558d6b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1518,6 +1518,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/wd4305" # truncation from 'type1' to 'type2' "/wd4800" # forcing value to bool 'true' or 'false' "/wd4828" # The file contains a character that is illegal + "/wd4996" # identifier was declared deprecated # errors: "/we4013" # 'function' undefined; assuming extern returning int "/we4133" # incompatible pointer types