[Bf-blender-cvs] [92bf11548d9] upstream_cycles_texture_cache: Cycles: Smaller fixes for differentials, taking dNdu inot account when getting N from a bump shader

Stefan Werner noreply at git.blender.org
Wed Jun 27 14:05:11 CEST 2018


Commit: 92bf11548d9405357ba6f18576628e9b71a6166b
Author: Stefan Werner
Date:   Thu Aug 3 14:44:56 2017 +0200
Branches: upstream_cycles_texture_cache
https://developer.blender.org/rB92bf11548d9405357ba6f18576628e9b71a6166b

Cycles: Smaller fixes for differentials, taking dNdu inot account when getting N from a bump shader

===================================================================

M	intern/cycles/kernel/svm/svm_tex_coord.h
M	intern/cycles/render/image.cpp

===================================================================

diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h
index 6ff39e5f587..4f395da34d7 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/svm_tex_coord.h
@@ -128,6 +128,9 @@ ccl_device void svm_node_tex_coord_bump_dx(KernelGlobals *kg,
 		}
 		case NODE_TEXCO_NORMAL: {
 			data = sd->N;
+#  ifdef __DNDU__
+			data = sd->N + sd->dNdx;
+#  endif
 			object_inverse_normal_transform(kg, sd, &data);
 			break;
 		}
@@ -211,6 +214,9 @@ ccl_device void svm_node_tex_coord_bump_dy(KernelGlobals *kg,
 		}
 		case NODE_TEXCO_NORMAL: {
 			data = sd->N;
+#  ifdef __DNDU__
+			data = sd->N + sd->dNdy;
+#  endif
 			object_inverse_normal_transform(kg, sd, &data);
 			break;
 		}
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 081db216e70..844abec7aab 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -1062,6 +1062,7 @@ bool ImageManager::make_tx(const string &filename, const string &outputfilename,
 	config.attribute("maketx:highlightcomp", 1);
 	config.attribute("maketx:updatemode", 1);
 	config.attribute("maketx:oiio_options", 1);
+	//config.attribute("maketx:updatemode", 1);
 	if(srgb) {
 		config.attribute("maketx:incolorspace", "sRGB");
 		config.attribute("maketx:outcolorspace", "linear");



More information about the Bf-blender-cvs mailing list