Merge pull request #949 from pierotofy/forgiveskip3d

Make skip-3dmodel and use_3dmesh args collision forgiving

opendm/config.py

@@ -556,7 +556,7 @@ def config():
       args.pc_classify = "smrf"
 
     if args.skip_3dmodel and args.use_3dmesh:
-      log.ODM_WARNING('--skip-3dmodel is set, but so is --use-3dmesh. You can\'t have both!')
-      sys.exit(1)
+      log.ODM_WARNING('--skip-3dmodel is set, but so is --use-3dmesh. --use_3dmesh will be ignored.')
+      args.use_3dmesh = False
 
     return args