Skip to content

Commit a838560

Browse files
Finalize changelog for MaterialX 1.35.4 (#54)
Finalize changelog for MaterialX 1.35.4 Also: - Switch Appveyor from VS2017 to VS2015 - Add a type alias for string vectors
1 parent 2c093c0 commit a838560

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: "{build}"
2-
os: Visual Studio 2017
2+
os: Visual Studio 2015
33
clone_folder: C:\Projects\MaterialX
44

55
environment:
@@ -8,7 +8,7 @@ environment:
88
PYTHON: C:\Python26
99
- CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
1010
PYTHON: C:\Python27-x64
11-
- CMAKE_PLATFORM: "Visual Studio 15 2017 Win64"
11+
- CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
1212
PYTHON: C:\Python36-x64
1313

1414
configuration:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Change Log
22

3-
## [1.35.4] - Development
3+
## [1.35.4] - 2017-12-18
44

55
### Added
66
- Added high-level Material API, including getPrimaryShaderParameters, getPrimaryShaderInputs, getBoundGeomStrings, and getBoundGeomCollections.

source/MaterialXCore/Library.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ using std::shared_ptr;
2828
using std::weak_ptr;
2929
using std::enable_shared_from_this;
3030

31+
/// A vector of strings.
32+
using StringVec = vector<string>;
3133
/// An unordered map with strings as both keys and values.
3234
using StringMap = std::unordered_map<string, string>;
3335
/// A set of strings.

source/MaterialXCore/Value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,6 @@ INSTANTIATE_TYPE(Vector4, vector4)
150150
INSTANTIATE_TYPE(Matrix3x3, matrix33)
151151
INSTANTIATE_TYPE(Matrix4x4, matrix44)
152152
INSTANTIATE_TYPE(string, string)
153-
INSTANTIATE_TYPE(vector<string>, stringarray)
153+
INSTANTIATE_TYPE(StringVec, stringarray)
154154

155155
} // namespace MaterialX

0 commit comments

Comments
 (0)