return value in all cases

aumuell · aumuell · commit f2d95310e223 · 2025-08-29T14:02:05.000+02:00
diff --git a/src/OpenCOVER/cover/coVRShader.cpp b/src/OpenCOVER/cover/coVRShader.cpp
@@ -927,9 +927,9 @@ void coVRShader::setUniformesFromAttribute(const char *uniformValues)
 
 osg::Uniform *coVRShader::getUniform(const std::string &name)
 {
-    auto u = getcoVRUniform(name);
-    if (u)
-        return u ? u->uniform.get() : nullptr;
+    if (auto u = getcoVRUniform(name))
+        return u->uniform.get();
+    return nullptr;
 }
 
 coVRUniform *coVRShader::getcoVRUniform(const std::string &name)

Original file line number	Diff line number	Diff line change
`@@ -927,9 +927,9 @@ void coVRShader::setUniformesFromAttribute(const char *uniformValues)`
`927`	`927`
`928`	`928`	`osg::Uniform *coVRShader::getUniform(const std::string &name)`
`929`	`929`	`{`
`930`		`- auto u = getcoVRUniform(name);`
`931`		`- if (u)`
`932`		`- return u ? u->uniform.get() : nullptr;`
	`930`	`+ if (auto u = getcoVRUniform(name))`
	`931`	`+ return u->uniform.get();`
	`932`	`+ return nullptr;`
`933`	`933`	`}`
`934`	`934`
`935`	`935`	`coVRUniform *coVRShader::getcoVRUniform(const std::string &name)`