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
AcademySoftwareFoundation · Dec 20, 2017 · a838560 · a838560
1 parent 2c093c0
commit a838560
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: "{build}"
-os: Visual Studio 2017
+os: Visual Studio 2015
 clone_folder: C:\Projects\MaterialX
 
 environment:
@@ -8,7 +8,7 @@ environment:
       PYTHON: C:\Python26
     - CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
       PYTHON: C:\Python27-x64
-    - CMAKE_PLATFORM: "Visual Studio 15 2017 Win64"
+    - CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
       PYTHON: C:\Python36-x64
 
 configuration:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## [1.35.4] - Development
+## [1.35.4] - 2017-12-18
 
 ### Added
 - Added high-level Material API, including getPrimaryShaderParameters, getPrimaryShaderInputs, getBoundGeomStrings, and getBoundGeomCollections.

diff --git a/source/MaterialXCore/Library.h b/source/MaterialXCore/Library.h
@@ -28,6 +28,8 @@ using std::shared_ptr;
 using std::weak_ptr;
 using std::enable_shared_from_this;
 
+/// A vector of strings.
+using StringVec = vector<string>;
 /// An unordered map with strings as both keys and values.
 using StringMap = std::unordered_map<string, string>;
 /// A set of strings.

diff --git a/source/MaterialXCore/Value.cpp b/source/MaterialXCore/Value.cpp
@@ -150,6 +150,6 @@ INSTANTIATE_TYPE(Vector4, vector4)
 INSTANTIATE_TYPE(Matrix3x3, matrix33)
 INSTANTIATE_TYPE(Matrix4x4, matrix44)
 INSTANTIATE_TYPE(string, string)
-INSTANTIATE_TYPE(vector<string>, stringarray)
+INSTANTIATE_TYPE(StringVec, stringarray)
 
 } // namespace MaterialX