[Bf-blender-cvs] [357e749] master: Cycles: Fix nondeterministic pass ordering when using baker
Sergey Sharybin
noreply at git.blender.org
Thu Sep 3 11:13:38 CEST 2015
Commit: 357e749957dc4899f11b6a9335a9cab2aac42b21
Author: Sergey Sharybin
Date: Thu Sep 3 13:52:56 2015 +0500
Branches: master
https://developer.blender.org/rB357e749957dc4899f11b6a9335a9cab2aac42b21
Cycles: Fix nondeterministic pass ordering when using baker
===================================================================
M intern/cycles/render/film.cpp
===================================================================
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 7282b04..5808028 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -144,7 +144,13 @@ void Pass::add(PassType type, vector<Pass>& passes)
pass.exposure = false;
break;
case PASS_LIGHT:
- /* ignores */
+ /* This isn't a real pass, used by baking to see whether
+ * light data is needed or not.
+ *
+ * Set components to 0 so pass sort below happens in a
+ * determined way.
+ */
+ pass.components = 0;
break;
#ifdef WITH_CYCLES_DEBUG
case PASS_BVH_TRAVERSAL_STEPS:
More information about the Bf-blender-cvs
mailing list