diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-05-24 12:50:32 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2019-05-24 12:54:01 +0200 |
commit | 2cdd87235fd86d9f2c0e8500be8d429b4f85b64a (patch) | |
tree | 75a41cb4319e2ade03b4d773d76e9f0a4090bf28 /src/render/renderers/opengl | |
parent | 6a8cfd6e52ad340c80b5a8b862b713192cecf791 (diff) |
Fix Parameter priority sorting
Parameters defined on an effect have priority over those defined in a Technique.
Change-Id: I49558a065b613d7ea9d1cbf0a64f6d5aad941cd3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/renderers/opengl')
-rw-r--r-- | src/render/renderers/opengl/jobs/renderviewjobutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp index 629e7e935..acb38ffb9 100644 --- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp +++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp @@ -407,14 +407,14 @@ void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList, // The parameters are taken in the following priority order: // // 1) Material - // 2) Technique - // 3) Effect + // 2) Effect + // 3) Technique // // That way a user can override defaults in Effect's and Techniques on a // object manner and a Technique can override global defaults from the Effect. parametersFromParametersProvider(infoList, manager, material); - parametersFromParametersProvider(infoList, manager, technique); parametersFromParametersProvider(infoList, manager, effect); + parametersFromParametersProvider(infoList, manager, technique); } void addToRenderStateSet(RenderStateSet *stateSet, |