[Bf-blender-cvs] [525673b] master: Cycles: Fix uninitialized variable issue after recent changes
Sergey Sharybin
noreply at git.blender.org
Wed Dec 14 17:31:18 CET 2016
Commit: 525673b37b1718bf9973eecf1ec467d538a99607
Author: Sergey Sharybin
Date: Wed Dec 14 17:30:50 2016 +0100
Branches: master
https://developer.blender.org/rB525673b37b1718bf9973eecf1ec467d538a99607
Cycles: Fix uninitialized variable issue after recent changes
===================================================================
M intern/cycles/kernel/closure/bsdf_microfacet.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 72fffe6..4a1316f 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -613,6 +613,9 @@ ccl_device int bsdf_microfacet_ggx_sample(KernelGlobals *kg, const ShaderClosure
}
}
}
+ else {
+ label = (m_refractive) ? LABEL_TRANSMIT|LABEL_GLOSSY : LABEL_REFLECT|LABEL_GLOSSY;
+ }
return label;
}
@@ -975,6 +978,9 @@ ccl_device int bsdf_microfacet_beckmann_sample(KernelGlobals *kg, const ShaderCl
}
}
}
+ else {
+ label = (m_refractive) ? LABEL_TRANSMIT|LABEL_GLOSSY : LABEL_REFLECT|LABEL_GLOSSY;
+ }
return label;
}
More information about the Bf-blender-cvs
mailing list