Fix a C++11 incompatibility.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 16 Mar 2014 21:16:07 +0000 (22:16 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 16 Mar 2014 21:16:07 +0000 (22:16 +0100)
complex_modulate_effect.cpp

index 7048608..6af589c 100644 (file)
@@ -25,7 +25,7 @@ void ComplexModulateEffect::set_gl_state(GLuint glsl_program_num, const string &
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
-       float num_repeats[] = { num_repeats_x, num_repeats_y };
+       float num_repeats[] = { float(num_repeats_x), float(num_repeats_y) };
        set_uniform_vec2(glsl_program_num, prefix, "num_repeats", num_repeats);
 
        // Set the secondary input to repeat (and nearest while we're at it).