diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-06-26 17:12:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-26 17:18:46 +0300 |
commit | 26b428186a51413dc2f0a338674a415cb510994a (patch) | |
tree | 54456b0b55d2056a4ef2a4d7417e5935e7ea2dc6 /source/blender/makesrna | |
parent | d10990af7944202f7be9ab4f02bb8a2d07dd6ad2 (diff) |
Fix T78295: reload scripts disables Cycles render passes in the compositor
Don't auto update render passes in nodes when unregistering render passes or
quitting Blender, this should only happen on explicit user action to change the
engine or passes.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 6af031eb7b0..a41abb1a1dd 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -299,7 +299,7 @@ static void rna_RenderEngine_unregister(Main *bmain, StructRNA *type) BLI_freelinkN(&R_engines, et); /* Stop all renders in case we were using this one. */ - ED_render_engine_changed(bmain); + ED_render_engine_changed(bmain, false); } static StructRNA *rna_RenderEngine_register(Main *bmain, diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index f0c4bd94c6a..2fc4ec2d626 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1662,7 +1662,7 @@ static void rna_RenderSettings_engine_update(Main *bmain, Scene *UNUSED(unused), PointerRNA *UNUSED(ptr)) { - ED_render_engine_changed(bmain); + ED_render_engine_changed(bmain, true); } static bool rna_RenderSettings_multiple_engines_get(PointerRNA *UNUSED(ptr)) |