Merge branch 'release/1.9.x'

2015-06-18 21:21:23 +02:00 · 2015-06-18 21:21:23 +02:00 · efa8633cb0
parent 5d364d6128 458ca5ea41
commit efa8633cb0
1 changed files with 2 additions and 2 deletions
--- a/panda/src/gobj/geomVertexColumn.cxx
+++ b/panda/src/gobj/geomVertexColumn.cxx
@ -353,9 +353,9 @@ make_packer() const {
    return new Packer_color;

  case C_normal:
-    if (get_num_values() != 3) {
+    if (get_num_values() != 3 && get_num_values() != 4) {
      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: