Merge branch 'master' into blender2.8

CMakeLists.txt

@@ -1454,6 +1454,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

release/scripts/startup/bl_ui/properties_data_metaball.py

@@ -106,6 +106,7 @@ class DATA_PT_metaball_element(DataButtonsPanel, Panel):
         col.separator()
 
         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")
 
@@ -116,7 +117,7 @@ class DATA_PT_metaball_element(DataButtonsPanel, Panel):
             sub.prop(metaelem, "size_y", text="Y")
             sub.prop(metaelem, "size_z", text="Z")
 
-        elif metaelem.type == 'TUBE':
+        elif metaelem.type == 'CAPSULE':
             sub.prop(metaelem, "size_x", text="Size X")
 
         elif metaelem.type == 'PLANE':

source/blender/makesrna/intern/rna_main_api.c

@@ -1751,7 +1751,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);