Merge branch 'release/1.9.x'

This commit is contained in:
rdb 2015-06-18 21:21:23 +02:00
commit efa8633cb0

View File

@ -353,9 +353,9 @@ make_packer() const {
return new Packer_color; return new Packer_color;
case C_normal: case C_normal:
if (get_num_values() != 3) { if (get_num_values() != 3 && get_num_values() != 4) {
gobj_cat.error() gobj_cat.error()
<< "GeomVertexColumn with contents C_normal must have 3 components!\n"; << "GeomVertexColumn with contents C_normal must have 3 or 4 components!\n";
} }
default: default: