Merge 8614fec into 904087b

mikedh · Nov 24, 2018 · 9cc1119 · 9cc1119
2 parents 904087b + 8614fec
commit 9cc1119
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/trimesh/scene/viewer.py b/trimesh/scene/viewer.py
@@ -46,7 +46,7 @@ def __init__(self,
 
         if scene.camera is not None:
             if resolution is not None:
-                if resolution != scene.camera.resolution:
+                if not all(resolution == scene.camera.resolution):
                     log.warning(
                         'resolution is overwritten by Camera: '
                         '{} -> {}'.format(resolution,