Install libomp in mac action

realkotob · Aug 27, 2023 · d0507a0 · d0507a0
1 parent 449ae3c
commit d0507a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/laigter-mac.yaml b/.github/workflows/laigter-mac.yaml
@@ -10,8 +10,9 @@ jobs:
     - name: setup Homebrew
       shell: bash
       run: |
+        rm '/usr/local/bin/2to3*' 
         export HOMEBREW_NO_AUTO_UPDATE=1 && export HOMEBREW_NO_INSTALL_CLEANUP=1 && brew update
-        HOMEBREW_VERBOSE_USING_DOTS=1 brew reinstall --verbose qt5
+        HOMEBREW_VERBOSE_USING_DOTS=1 brew reinstall --verbose qt5 llvm
     - name: build Laigter
       shell: bash
       run: |

diff --git a/src/image_processor.cpp b/src/image_processor.cpp
@@ -799,9 +799,9 @@ void ImageProcessor::generate_normal_map(bool updateEnhance, bool updateBump, bo
   }
   heightOv = heightOv.mul(heightOv.get_channel(3) / 255.0);
 
-  for (int i = 0; i < rlist.count(); i++)
+  //for (int i = 0; i < rlist.count(); i++)
   {
-    m_height_ov = calculate_normal(heightOv.channel(0), 5000, 0, rlist.at(i));
+    m_height_ov = calculate_normal(heightOv.channel(0), 5000, 0);
   }
 
   if (update_tileable)
@@ -820,9 +820,9 @@ void ImageProcessor::generate_normal_map(bool updateEnhance, bool updateBump, bo
 
   if (updateEnhance)
   {
-    for (int i = 0; i < rlist.count(); i++)
+    //for (int i = 0; i < rlist.count(); i++)
     {
-      m_emboss_normal = calculate_normal(m_gray * 10.0, normal_depth, normal_blur_radius, rlist.at(i));
+      m_emboss_normal = calculate_normal(m_gray * 10.0, normal_depth, normal_blur_radius);
     }
   }
 
@@ -833,9 +833,9 @@ void ImageProcessor::generate_normal_map(bool updateEnhance, bool updateBump, bo
 
   if (updateBump)
   {
-    for (int i = 0; i < rlist.count(); i++)
+    //for (int i = 0; i < rlist.count(); i++)
     {
-      m_distance_normal = calculate_normal(new_distance, normal_bisel_depth * normal_bisel_distance, normal_bisel_blur_radius, rlist.at(i));
+      m_distance_normal = calculate_normal(new_distance, normal_bisel_depth * normal_bisel_distance, normal_bisel_blur_radius);
     }
   }