[Bf-blender-cvs] [c0a9337] master: Yet another OSL compilation fix...sorry.

Thomas Dinges noreply at git.blender.org
Fri Jul 25 11:42:56 CEST 2014


Commit: c0a9337caab2a2ae40959bac4a97830badbe593d
Author: Thomas Dinges
Date:   Fri Jul 25 11:42:21 2014 +0200
Branches: master
https://developer.blender.org/rBc0a9337caab2a2ae40959bac4a97830badbe593d

Yet another OSL compilation fix...sorry.

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

M	intern/cycles/kernel/osl/osl_services.h

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

diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h
index 34c8899..024a839 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -216,10 +216,9 @@ public:
 		return get_userdata(derivatives, name, type, (OSL::ShaderGlobals *) renderstate, val);
 	}
 
-	bool get_texture_info(OSL::ShaderGlobals *sg, ustring filename, int subimage,
+	bool get_texture_info(ustring filename, int subimage,
 	                      ustring dataname, TypeDesc datatype, void *data) {
-		return 	get_texture_info(NULL, filename, subimage,
-									  dataname, datatype, *data);
+		return get_texture_info(NULL, filename, subimage, dataname, datatype, data);
 	}
 #endif
 private:




More information about the Bf-blender-cvs mailing list