From d6c0bf69b63b30f68d0ba0092dbae0911c00dd9b Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Fri, 1 Jan 2010 13:32:03 +0100 Subject: [PATCH] fix up some merge weirdness --- simgear/scene/sky/newcloud.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx index 1518b133..1e16629e 100644 --- a/simgear/scene/sky/newcloud.cxx +++ b/simgear/scene/sky/newcloud.cxx @@ -69,7 +69,6 @@ EffectMap effectMap; double SGNewCloud::sprite_density = 1.0; - SGNewCloud::SGNewCloud(string type, const SGPath &tex_path, string tex, @@ -222,7 +221,7 @@ osg::ref_ptr SGNewCloud::genCloud() { z = height * cos(elev) * 0.5f; } - // Determine the height and width as scaling factors on the minimum size (used to create the quad) + // Determine the height and width as scaling factors on the minimum size (used to create the quad). float sprite_width = 1.0f + sg_random() * (max_sprite_width - min_sprite_width) / min_sprite_width; float sprite_height = 1.0f + sg_random() * (max_sprite_height - min_sprite_height) / min_sprite_height; -- 2.39.5