Revision: 61451
https://developer.blender.org/rBL61451
Author: juicyfruit
Date: 2014-11-24 20:10:26 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
OSL bump to 1.5.11 + sergey alignfix
Modified Paths:
--------------
trunk/lib/win64_vc12/osl/include/OSL/oslexec.h
trunk/lib/win64_vc12/osl/include/OSL/oslversion.h
trunk/lib/win64_vc12/osl/lib/libtestshade.lib
trunk/lib/win64_vc12/osl/lib/oslcomp.lib
trunk/lib/win64_vc12/osl/lib/oslexec.lib
trunk/lib/win64_vc12/osl/lib/oslquery.lib
Modified: trunk/lib/win64_vc12/osl/include/OSL/oslexec.h
===================================================================
--- trunk/lib/win64_vc12/osl/include/OSL/oslexec.h 2014-11-24 18:08:13 UTC
(rev 61450)
+++ trunk/lib/win64_vc12/osl/include/OSL/oslexec.h 2014-11-24 20:10:26 UTC
(rev 61451)
@@ -234,9 +234,9 @@
/// int num_textures_needed The number of texture names that are
/// known to be potentially needed by the
/// group (after optimization).
- /// string textures_needed[] The names of the textures known to be
- /// needed. Must be of length at least as
- /// long as num_textures_needed.
+ /// ptr textures_needed Retrieves a pointer to the ustring array
+ /// containing all textures known to be
+ /// needed.
/// int unknown_textures_needed Nonzero if additional textures may be
/// needed, whose names can't be known
/// without actually running the shader.
@@ -418,7 +418,8 @@
std::string getstats (int level=1) const;
void register_closure (string_view name, int id, const ClosureParam
*params,
- PrepareClosureFunc prepare, SetupClosureFunc setup);
+ PrepareClosureFunc prepare, SetupClosureFunc setup,
+ int alignment = 1);
/// Query either by name or id an existing closure. If name is non
/// NULL it will use it for the search, otherwise id would be used
/// and the name will be placed in name if successful. Also return
Modified: trunk/lib/win64_vc12/osl/include/OSL/oslversion.h
===================================================================
--- trunk/lib/win64_vc12/osl/include/OSL/oslversion.h 2014-11-24 18:08:13 UTC
(rev 61450)
+++ trunk/lib/win64_vc12/osl/include/OSL/oslversion.h 2014-11-24 20:10:26 UTC
(rev 61451)
@@ -43,7 +43,7 @@
// Version of this library:
#define OSL_LIBRARY_VERSION_MAJOR 1
#define OSL_LIBRARY_VERSION_MINOR 5
-#define OSL_LIBRARY_VERSION_PATCH 10
+#define OSL_LIBRARY_VERSION_PATCH 11
#define OSL_LIBRARY_VERSION_RELEASE_TYPE
#define OSL_LIBRARY_VERSION_CODE (10000 * OSL_LIBRARY_VERSION_MAJOR + \
Modified: trunk/lib/win64_vc12/osl/lib/libtestshade.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc12/osl/lib/oslcomp.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc12/osl/lib/oslexec.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/win64_vc12/osl/lib/oslquery.lib
===================================================================
(Binary files differ)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
