Cycles: Override World per View Layer #117920

Jonas Dichelle · 2024-02-06T21:55:24+01:00

Jonas Dichelle commented

2024-02-06 21:55:24 +01:00

Override World per View Layer

Description

This pull request adds the functionality to override the current world for each view layer, this adds to the current functionality of being able to override the material for all objects per view layer.

Why?

This feature is useful for many production scenarios as it allows for the creation of separate render passes with specific worlds. This would help workflows that require different skies or other backgrounds for compositing.

Implementation

I mostly coppied the implementation of the material_override code and added code to set the world to world_override at render time.

Design issue: #117919

# Override World per View Layer ## Description This pull request adds the functionality to override the current world for each view layer, this adds to the current functionality of being able to override the material for all objects per view layer. ### Why? This feature is useful for many production scenarios as it allows for the creation of separate render passes with specific worlds. This would help workflows that require different skies or other backgrounds for compositing. ### Implementation I mostly coppied the implementation of the `material_override` code and added code to set the `world` to `world_override` at render time. <video src="/attachments/dbca0086-5129-468f-968e-1a9a42da571e" title="blender_wtJyvyipuU.mp4" controls></video> Design issue: #117919

blender_TFfTRNYg92.mp4

379 KiB

👍 4 ❤️ 4 🎉 3

Jonas Dichelle added 1 commit 2024-02-06 21:55:41 +01:00

edd2f7b50f added dna and experimental rna to add override background

Jonas Dichelle referenced this pull request

2024-02-06 21:56:28 +01:00

Override World per View Layer #117919

Jonas Dichelle added 1 commit 2024-02-07 16:43:50 +01:00

0772dadd30 fixed updating of wolrd_override

-found and added missing use of world_override
-removed hacky use of ED_render_engine_changed

Jonas Dichelle added 1 commit 2024-02-07 16:44:56 +01:00

1db53ce860 fixed formatting

Jonas Dichelle added 1 commit 2024-02-07 16:46:03 +01:00

buildbot/vexp-code-patch-lint Build done. Details

buildbot/vexp-code-patch-windows-amd64 Build done. Details

buildbot/vexp-code-patch-linux-x86_64 Build done. Details

buildbot/vexp-code-patch-darwin-x86_64 Build done. Details

buildbot/vexp-code-patch-darwin-arm64 Build done. Details

buildbot/vexp-code-patch-coordinator Build done. Details

28ade7fb2e Merge branch 'main' of projects.blender.org:blender/blender into override-background

Jonas Dichelle changed title from ~~WIP: Override World per View Layer~~ to Override World per View Layer

2024-02-07 19:19:29 +01:00

Jonas Dichelle changed title from ~~Override World per View Layer~~ to Cycles: Override World per View Layer

2024-02-07 19:48:09 +01:00

Jonas Dichelle requested review from Brecht Van Lommel 2024-02-07 19:50:25 +01:00

Brecht Van Lommel requested changes 2024-02-08 15:31:27 +01:00

Brecht Van Lommel left a comment

Thanks.

source/blender/makesrna/intern/rna_scene.cc Outdated

						
				@ -1877,6 +1877,15 @@ void rna_ViewLayer_material_override_update(Main *bmain, Scene * /*scene*/, Poin

				  DEG_relations_tag_update(bmain);

				}

				void rna_ViewLayer_world_override_update(Main *bmain, Scene *scene, PointerRNA *ptr)

Brecht Van Lommel commented

2024-02-08 15:29:54 +01:00

Instead of adding a new function, can you rename rna_ViewLayer_material_override_update to rna_ViewLayer_override_update, and use it for both?

The NC_SCENE | ND_RENDER_OPTIONS, as used for material overrides are correct for the world too, it should not be NC_WORLD because it's not the world itself that is changing.

Instead of adding a new function, can you rename `rna_ViewLayer_material_override_update` to `rna_ViewLayer_override_update`, and use it for both? The `NC_SCENE | ND_RENDER_OPTIONS,` as used for material overrides are correct for the world too, it should not be `NC_WORLD` because it's not the world itself that is changing.

JonasDichelle marked this conversation as resolved

source/blender/makesrna/intern/rna_scene.cc Outdated

						
				@ -4740,0 +4751,4 @@

				    RNA_def_property_struct_type(prop, "World");

				    RNA_def_property_flag(prop, PROP_EDITABLE);

				    RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);

				    RNA_def_property_ui_text(prop, "World Override", "World to override world in this view layer");

Brecht Van Lommel commented

2024-02-08 15:30:47 +01:00

Would shorten the description to: "Override world in this view layer"

JonasDichelle marked this conversation as resolved

Brecht Van Lommel commented

2024-02-08 15:31:42 +01:00

@blender-bot build

Jonas Dichelle added 1 commit 2024-02-08 17:35:47 +01:00

0e24fb01dc Merge branch 'main' of projects.blender.org:blender/blender into override-background

Jonas Dichelle added 1 commit 2024-02-08 18:19:06 +01:00

30a1879c46 fixes for code review

-merged functions for material and world overrides into view layer override function
-updated description

Jonas Dichelle requested review from Brecht Van Lommel 2024-02-08 18:19:18 +01:00

Brecht Van Lommel requested changes 2024-02-08 18:31:57 +01:00

source/blender/makesrna/intern/rna_scene.cc Outdated

						
				@ -1874,2 +1873,3 @@

				void rna_ViewLayer_override_update(Main *bmain, Scene *scene, PointerRNA *ptr)

				{

				  Scene *scene = (Scene *)ptr->owner_id;

				  Scene *screen = (Scene *)ptr->owner_id;

Brecht Van Lommel commented

2024-02-08 18:31:12 +01:00

Don't change scene to screen, it's actually a scene.

Jonas Dichelle commented

2024-02-08 18:47:51 +01:00

I had coppied that from rna_Scene_world_update while testing.
Do you think it's a typo there?

I had coppied that from `rna_Scene_world_update` while testing. Do you think it's a typo there?

JonasDichelle marked this conversation as resolved

source/blender/makesrna/intern/rna_scene.cc Outdated

						
				@ -1876,1 +1875,4 @@

				  Scene *screen = (Scene *)ptr->owner_id;

				  rna_Scene_render_update(bmain, scene, ptr);

				  WM_main_add_notifier(NC_SCENE | ND_RENDER_OPTIONS, &screen->id);

Brecht Van Lommel commented

2024-02-08 18:30:58 +01:00

This should not be needed, it's already done through specifying those flags to RNA_def_property_update.

Really the operation of this function should be unchanged, only its name needs to be changed.

This should not be needed, it's already done through specifying those flags to `RNA_def_property_update`. Really the operation of this function should be unchanged, only its name needs to be changed.

JonasDichelle marked this conversation as resolved

Jonas Dichelle added 1 commit 2024-02-08 18:46:29 +01:00