summaryrefslogtreecommitdiffstats
path: root/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/renderers/opengl/jobs/renderviewjobutils.cpp')
-rw-r--r--src/render/renderers/opengl/jobs/renderviewjobutils.cpp6
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,