blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

MacOS: Enable support for EDR rendering #105662

Merged
Brecht Van Lommel merged 26 commits from Jason-Fielder/blender:macos_EDR_support into main 2023-08-09 14:25:23 +02:00
Conversation 34 Commits 26 Files Changed 28 +9 -5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 725ed87ebb - Show all commits

5
scripts/startup/bl_ui/properties_render.py
View File

@ -81,8 +81,11 @@ class RENDER_PT_color_management(RenderButtonsPanel, Panel):
col.prop(view, "exposure")
brecht marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-07-26 19:07:03 +02:00
Outdated
Review
Copy Link

It's a bit of a hack as we can't automatically check for this in general, but I think graying it out for Filmic will help avoid some confusion:

if gpu.capabilities.hdr_support_get():
    sub = col.row()
    sub.active = view.view_transfrom != "Filmic"
    sub.prop(view, "use_hdr_view")
It's a bit of a hack as we can't automatically check for this in general, but I think graying it out for Filmic will help avoid some confusion: ``` if gpu.capabilities.hdr_support_get(): sub = col.row() sub.active = view.view_transfrom != "Filmic" sub.prop(view, "use_hdr_view") ```
col.prop(view, "gamma")
# Only display HDR toggle for non-Filmic display transforms.
if gpu.capabilities.hdr_support_get():
col.prop(view, "use_hdr_view")
sub = col.row()
sub.active = (view.view_transform != "Filmic" and view.view_transform != "Filmic Log")
sub.prop(view, "use_hdr_view")
col.separator()

9
source/blender/makesrna/intern/rna_color.cc
View File

@ -1275,10 +1275,11 @@ static void rna_def_colormanage(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_hdr_view", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", COLORMANAGE_VIEW_USE_HDR);
RNA_def_property_ui_text(prop,
"High Dynamic Range",
"Enable high dynamic range with extended colorspace in viewport, "
"uncapping display brightness for rendered content");
RNA_def_property_ui_text(
prop,
"High Dynamic Range",
"Enable high dynamic range display in rendered viewport, uncapping display brightness. This "
"requires a monitor with HDR support and a view transform designed for HDR.");
RNA_def_property_update(prop, NC_WINDOW, "rna_ColorManagedColorspaceSettings_reload_update");
/* ** Color-space ** */