From 2613a2552dec7d236032f2b4a1dd367be9214df5 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 14 Mar 2022 14:21:10 +0100 Subject: Fix some properties missing in the UI for new Curves object type Missed some renames from HAIR to CURVES. --- intern/cycles/blender/addon/ui.py | 4 ++-- release/scripts/startup/bl_ui/properties_object.py | 2 +- release/scripts/startup/bl_ui/space_node.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 2b74a1b7ccf..64de1227355 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1031,7 +1031,7 @@ class CYCLES_OBJECT_PT_motion_blur(CyclesButtonsPanel, Panel): def poll(cls, context): ob = context.object if CyclesButtonsPanel.poll(context) and ob: - if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA', 'HAIR', 'POINTCLOUD'}: + if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA', 'CURVES', 'POINTCLOUD'}: return True if ob.instance_type == 'COLLECTION' and ob.instance_collection: return True @@ -1070,7 +1070,7 @@ class CYCLES_OBJECT_PT_motion_blur(CyclesButtonsPanel, Panel): def has_geometry_visibility(ob): - return ob and ((ob.type in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META', 'LIGHT', 'VOLUME', 'POINTCLOUD', 'HAIR'}) or + return ob and ((ob.type in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META', 'LIGHT', 'VOLUME', 'POINTCLOUD', 'CURVES'}) or (ob.instance_type == 'COLLECTION' and ob.instance_collection)) diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 5721e20f328..89f840306e1 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -193,7 +193,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): obj = context.object obj_type = obj.type - is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'VOLUME', 'HAIR', 'POINTCLOUD'}) + is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'VOLUME', 'CURVES', 'POINTCLOUD'}) has_bounds = (is_geometry or obj_type in {'LATTICE', 'ARMATURE'}) is_wire = (obj_type in {'CAMERA', 'EMPTY'}) is_empty_image = (obj_type == 'EMPTY' and obj.empty_display_type == 'IMAGE') diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 7c88006a4d6..d7d905cb820 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -61,7 +61,7 @@ class NODE_HT_header(Header): layout.separator_spacer() types_that_support_material = {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META', - 'GPENCIL', 'VOLUME', 'HAIR', 'POINTCLOUD'} + 'GPENCIL', 'VOLUME', 'CURVES', 'POINTCLOUD'} # disable material slot buttons when pinned, cannot find correct slot within id_from (T36589) # disable also when the selected object does not support materials has_material_slots = not snode.pin and ob_type in types_that_support_material -- cgit v1.2.3