diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-06-23 17:29:14 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-06-23 17:29:14 +0300 |
| commit | ff3b9d63cbd504f17ad28a9660831c19cda81f98 (patch) | |
| tree | a6b47408a86f6f23aad820376458070a76f56195 /release/scripts/startup/bl_ui/space_view3d.py | |
| parent | 769468d125c863ed22c152e5dda4605ce2260f06 (diff) | |
| parent | 27972c4225c26780eb957ddf0c98ce4cee3d29e5 (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0b1dfe7dc83..503ec63dd39 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -131,7 +131,7 @@ class VIEW3D_HT_tool_header(Header): if is_valid_context: brush = context.tool_settings.gpencil_sculpt_paint.brush tool = brush.gpencil_tool - if tool in ('SMOOTH', 'RANDOMIZE'): + if tool in {'SMOOTH', 'RANDOMIZE'}: layout.popover("VIEW3D_PT_tools_grease_pencil_sculpt_options") layout.popover("VIEW3D_PT_tools_grease_pencil_sculpt_appearance") elif tool_mode == 'WEIGHT_GPENCIL': @@ -2187,9 +2187,9 @@ class VIEW3D_MT_add(Menu): layout.menu("VIEW3D_MT_surface_add", icon='OUTLINER_OB_SURFACE') layout.menu("VIEW3D_MT_metaball_add", text="Metaball", icon='OUTLINER_OB_META') layout.operator("object.text_add", text="Text", icon='OUTLINER_OB_FONT') - if hasattr(bpy.data, "hairs"): + if context.preferences.experimental.use_new_hair_type: layout.operator("object.hair_add", text="Hair", icon='OUTLINER_OB_HAIR') - if hasattr(bpy.data, "pointclouds"): + if context.preferences.experimental.use_new_particle_system: layout.operator("object.pointcloud_add", text="Point Cloud", icon='OUTLINER_OB_POINTCLOUD') layout.menu("VIEW3D_MT_volume_add", text="Volume", icon='OUTLINER_OB_VOLUME') layout.operator_menu_enum("object.gpencil_add", "type", text="Grease Pencil", icon='OUTLINER_OB_GREASEPENCIL') |