[Bf-blender-cvs] [5808ca88ef3] compositor-cryptomatte-workflow: Don't use fallback sampler when there is no render result.
Jeroen Bakker
noreply at git.blender.org
Mon Mar 15 10:13:53 CET 2021
Commit: 5808ca88ef3ab508af17e5f24015ae7ca34f92e7
Author: Jeroen Bakker
Date: Mon Mar 15 10:13:19 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB5808ca88ef3ab508af17e5f24015ae7ca34f92e7
Don't use fallback sampler when there is no render result.
===================================================================
M source/blender/editors/interface/interface_eyedropper_color.c
===================================================================
diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c
index a94f1b8efb1..f20d7d88102 100644
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_color.c
@@ -382,7 +382,12 @@ static void eyedropper_color_sample(bContext *C, Eyedropper *eye, int mx, int my
{
/* Accumulate color. */
float col[3];
- if (!eyedropper_cryptomatte_sample_fl(C, eye, mx, my, col)) {
+ if (eye->crypto_node) {
+ if (!eyedropper_cryptomatte_sample_fl(C, eye, mx, my, col)) {
+ return;
+ }
+ }
+ else {
eyedropper_color_sample_fl(C, mx, my, col);
}
More information about the Bf-blender-cvs
mailing list