Changeset 9550 for code/trunk/src/libraries/tools/Shader.h
- Timestamp:
- Mar 12, 2013, 11:13:03 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/testing (added) merged: 9015,9017,9020-9022,9025-9026,9047,9076-9078,9114-9115,9221-9226,9356,9473-9480,9524,9529-9531,9533-9545,9547-9549
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/tools/Shader.h
r8729 r9550 114 114 std::string parameter_; ///< The name of the parameter 115 115 116 int valueInt_; ///< The desired int value of the parameter 117 float valueFloat_; ///< The desired float value of the parameter 118 119 MT_Type::Value valueType_; ///< The type of the parameter (currently only int or float) 116 MultiType value_; ///< The desired value of the parameter 120 117 }; 121 118
Note: See TracChangeset
for help on using the changeset viewer.