Merge branch 'master' into mirceakitsune/world_cubemaps

diff --git a/scripts/shader-cpp.sh b/scripts/shader-cpp.sh
index 4d0d4d85cdae3f323df79fd2c2cd00319ddec0cb..95568f6f7c4a4515440de4b93af4633552791896 100755 (executable)
--- a/scripts/shader-cpp.sh
+++ b/scripts/shader-cpp.sh
@@ -174,7 +174,7 @@ conditionalize()
 }
 parse_shader_post()
 {
-       allconds=`echo "$shaderconds" | sort -u | grep .`
+       allconds=`echo "$shaderconds" | sort -u | grep . || true`
        conds=
        conditionalize "$allconds"
 }