Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I903f92a7b910eee165a2dd708a2d5fb25192ab14

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,