Merge branch 'master' of https://git.suwa3d.com/natuka/modelmaking.api.suwa3d.com

main_step1.py

@@ -82,6 +82,10 @@ def detect_markers(psid, pid):
             if filename.endswith('_8.xmp'):
                 # photo3 exist, 设置photo2的xmp文件，不参与贴图
                 libs.set_photo_join_type(config.workdir, pid, 'photo2', filename.split('_')[0], mesh='1', texture='0')
+        for filename in os.listdir(os.path.join(config.workdir, pid, 'photo3')):
+            if filename.endswith('_8.xmp'):
+                # photo3 exist, 设置photo3的xmp文件，不参与建模
+                libs.set_photo_join_type(config.workdir, pid, 'photo3', filename.split('_')[0], mesh='0', texture='1')
 
 def cal_reconstruction_region(psid, pid):
     def fix_region():