diff options
Diffstat (limited to 'release')
-rw-r--r-- | release/datafiles/colormanagement/config.ocio | 2 | ||||
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/utils_spell_check.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 34 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 7 |
5 files changed, 31 insertions, 16 deletions
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index d73561338ba..2d5f68f0a45 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -66,7 +66,7 @@ colorspaces: Rec. 709 (Full Range), Blender native linear space isdata: false allocation: lg2 - allocationvars: [-8.5, 5] + allocationvars: [-15, 6] - !<ColorSpace> name: Raw diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py index 3dbddc30f0d..9daddfe5dc4 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -296,6 +296,7 @@ class SpellChecker(): "spacebar", "tooltip", "tooltips", "trackpad", + "tuple", "unicode", "viewport", "viewports", "viscoelastic", @@ -437,6 +438,7 @@ class SpellChecker(): "ascii", "atrac", "bsdf", + "bssrdf", "bw", "ccd", "cmd", diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index c5dbe946012..7c32e72b3e3 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -204,36 +204,40 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): def draw(self, context): layout = self.layout - ob = context.object + obj = context.object split = layout.split() col = split.column() - col.prop(ob, "draw_type", text="Type") + col.prop(obj, "draw_type", text="Type") col = split.column() row = col.row() - row.prop(ob, "show_bounds", text="Bounds") + row.prop(obj, "show_bounds", text="Bounds") sub = row.row() - sub.active = ob.show_bounds - sub.prop(ob, "draw_bounds_type", text="") + sub.active = obj.show_bounds + sub.prop(obj, "draw_bounds_type", text="") split = layout.split() col = split.column() - col.prop(ob, "show_name", text="Name") - col.prop(ob, "show_axis", text="Axis") - if ob.type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}: + col.prop(obj, "show_name", text="Name") + col.prop(obj, "show_axis", text="Axis") + + obj_type = obj.type + + if obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}: # Makes no sense for cameras, armtures, etc.! - col.prop(ob, "show_wire", text="Wire") + col.prop(obj, "show_wire", text="Wire") # Only useful with object having faces/materials... - col.prop(ob, "color", text="Object Color") + col.prop(obj, "color", text="Object Color") col = split.column() - col.prop(ob, "show_texture_space", text="Texture Space") - col.prop(ob, "show_x_ray", text="X-Ray") - if ob.type == 'MESH': - col.prop(ob, "show_transparent", text="Transparency") - col.prop(ob, "show_all_edges") + col.prop(obj, "show_texture_space", text="Texture Space") + col.prop(obj, "show_x_ray", text="X-Ray") + if obj_type == 'MESH' or (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE'): + col.prop(obj, "show_transparent", text="Transparency") + if obj_type == 'MESH': + col.prop(obj, "show_all_edges") class OBJECT_PT_duplication(ObjectButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 43761dd439e..d81356b3113 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -886,6 +886,7 @@ class CLIP_PT_tools_clip(CLIP_PT_clip_view_panel, Panel): layout.operator("clip.set_viewport_background") layout.operator("clip.setup_tracking_scene") + layout.operator("clip.prefetch") class CLIP_MT_view(Menu): @@ -945,6 +946,7 @@ class CLIP_MT_clip(Menu): layout.operator("clip.open") if clip: + layout.operator("clip.prefetch") layout.operator("clip.reload") layout.menu("CLIP_MT_proxy") diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 26c76bd6655..ac76b988e05 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -151,10 +151,17 @@ class NODE_MT_select(Menu): layout.operator("node.select_all", text="Inverse").action = 'INVERT' layout.operator("node.select_linked_from") layout.operator("node.select_linked_to") + + layout.separator() + layout.operator("node.select_same_type") layout.operator("node.select_same_type_step").prev = True layout.operator("node.select_same_type_step").prev = False + layout.separator() + + layout.operator("node.find_node") + class NODE_MT_node(Menu): bl_label = "Node" |