diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-18 03:03:52 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-18 03:03:52 +0200 |
commit | 186b082e965a965bd5ded451e5ab533b7757c821 (patch) | |
tree | d558e1a5e2550677ac3800162ceed8b448b0f1a6 /src/render/renderers/opengl/jobs | |
parent | c61479f9a6be1ee239aef48babc854bbebec4b31 (diff) | |
parent | 5c61a32369b003bae6ed045da230db8d8dd0f82d (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I942a33e63084b346702577e28c70f2111e40a4d5
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 8a1a8faea..e55497d06 100644 --- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp +++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp @@ -423,14 +423,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, |