diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:28:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:28:23 +0300 |
| commit | c72380a427a4af9cacafc0e6bfe8f0f40c8e6dc5 (patch) | |
| tree | 5aec87124965bf543d1edc918f7c5bcd8c1cb9bb | |
| parent | c29d18c4c855025a0234435cc05dfad78d3d555f (diff) | |
| parent | fcf3aa90daed0dde8c770857990f92c6601f8096 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_metaball.py | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 389287c04a7..f4dd45d5533 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index 75015a57f5f..267577ae3b4 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/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': diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 3f486b0e477..70dcf20dcc6 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/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); |