Merge 28a916b into 904087b

mikedh · Nov 24, 2018 · e414c53 · e414c53
2 parents 904087b + 28a916b
commit e414c53
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/trimesh/scene/viewer.py b/trimesh/scene/viewer.py
@@ -46,7 +46,8 @@ def __init__(self,
 
         if scene.camera is not None:
             if resolution is not None:
-                if resolution != scene.camera.resolution:
+                if not np.allclose(resolution, scene.camera.resolution,
+                                   rtol=0, atol=0):
                     log.warning(
                         'resolution is overwritten by Camera: '
                         '{} -> {}'.format(resolution,