Updates for the bump-mapped 2d cloud code.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 1f7032f8a5f47566ebcefcd513032bbc79255be1..36d279fcf1ad459cfc5c0c91a82141a8509cfb34 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -258,7 +258,8 @@ void fgInitVisuals( void ) {
 // For HiRes screen Dumps using Brian Pauls TR Library
 void trRenderFrame( void ) {
 #ifdef FG_ENABLE_MULTIPASS_CLOUDS
-    bool multi_pass_clouds = fgGetBool("/sim/rendering/multi-pass-clouds");
+    bool multi_pass_clouds = fgGetBool("/sim/rendering/multi-pass-clouds") &&
+                            !SGCloudLayer::enable_bump_mapping; // ugly artefact now
 #else
     bool multi_pass_clouds = false;
 #endif
@@ -383,7 +384,8 @@ void fgRenderFrame() {
     bool enhanced_lighting = fgGetBool("/sim/rendering/enhanced-lighting");
     bool distance_attenuation = fgGetBool("/sim/rendering/distance-attenuation");
 #ifdef FG_ENABLE_MULTIPASS_CLOUDS
-    bool multi_pass_clouds = fgGetBool("/sim/rendering/multi-pass-clouds");
+    bool multi_pass_clouds = fgGetBool("/sim/rendering/multi-pass-clouds") && 
+                                !SGCloudLayer::enable_bump_mapping;  // ugly artefact now
 #else
     bool multi_pass_clouds = false;
 #endif