diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:02:52 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:02:52 +0200 |
commit | e0548a3d24bda6ddee02c38d3abee285ddf33a6d (patch) | |
tree | 06c9d30eab9d00657a8bee8510774433c5cb0c25 /src/render/renderers/opengl/jobs | |
parent | 666a645d1edc98dfea92fdaf7eaeed10c86dbc56 (diff) | |
parent | 50d41e6f0e7dd97f3d4cbd68423d59cacd4b7700 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I903f92a7b910eee165a2dd708a2d5fb25192ab14
Diffstat (limited to 'src/render/renderers/opengl/jobs')
-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 9dd7faacc..13d850e71 100644 --- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp +++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp @@ -419,14 +419,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, |