X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Flighting.cpp;h=7f662c72d9ccf55bdb0e5e8831706b9781709360;hp=2ba1edc5560e00889ecd31fa01592f121a68a993;hb=9fff9eb832db3b64416ae49bbdc826f33e3ceb19;hpb=08abb340625c6d281496095f2a664f27570c2b64

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 2ba1edc5..7f662c72 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,4 +1,5 @@
 #include <stdexcept>
+#include "error.h"
 #include "light.h"
 #include "lighting.h"
 #include "lightunit.h"
@@ -38,9 +39,6 @@ void Lighting::set_horizon_angle(const Geometry::Angle<float> &a)
 
 void Lighting::attach(unsigned i, const Light &l)
 {
-	if(i>=LightUnit::get_n_units())
-		throw out_of_range("Lighting::attach");
-
 	if(i>=lights.size())
 		lights.resize(i+1);
 
@@ -73,6 +71,9 @@ void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix
 
 void Lighting::bind() const
 {
+	if(lights.size()>LightUnit::get_n_units())
+		throw invalid_operation("Lighting::bind");
+
 	if(!set_current(this))
 		return;