merge default into minor

--HG--
branch : minor
This commit is contained in:
Bill Meltsner
2011-03-12 09:58:40 -05:00
4 changed files with 19 additions and 6 deletions
@@ -148,7 +148,7 @@ namespace opengl
ParticleSystem * t = luax_checkparticlesystem(L, 1);
float arg1 = (float)luaL_checknumber(L, 2);
float arg2 = (float)luaL_optnumber(L, 3, arg1);
float arg3 = (float)luaL_optnumber(L, 3, 0);
float arg3 = (float)luaL_optnumber(L, 4, 0);
t->setSize(arg1, arg2, arg3);
return 0;
}