Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan

Former-commit-id: 86b8e6b5dc1ecada14715b8a9795dabae17aad0e [formerly 8c5d31f62a194631160cde47084df94dbfcbee4d]
Former-commit-id: c4de4d4e47596c86c42577dc29f934fa7cdc045f
This commit is contained in:
Lynix 2016-07-11 12:16:11 +02:00
commit 78c4fa0521
1 changed files with 1 additions and 1 deletions

View File

@ -249,7 +249,7 @@ namespace Nz
case ParameterType_Integer: case ParameterType_Integer:
*value = it->second.value.intVal; *value = it->second.value.intVal;
return false; return true;
case ParameterType_String: case ParameterType_String:
{ {