diff --git a/CMakeLists.txt b/CMakeLists.txt index e22ded5..78fd0a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,8 @@ download_project( SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/libigl DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/external/.cache/libigl QUIET - GIT_REPOSITORY https://github.com/jiangzhongshi/libigl.git + GIT_REPOSITORY https://github.com/libigl/libigl.git + GIT_TAG 682e4b9685d2737215f6629ecafcb318d714d556 ) set(LIBIGL_INCLUDE_DIR ) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/libigl/cmake") diff --git a/src/UI/TextureGUI.cpp b/src/UI/TextureGUI.cpp index 92af913..3adb15a 100644 --- a/src/UI/TextureGUI.cpp +++ b/src/UI/TextureGUI.cpp @@ -189,8 +189,8 @@ bool TextureGUI::post_draw() { bool TextureGUI::pre_draw() { if (re_draw_) { if (!viewer_cores_init) { - viewer_core_3d_ = v_.core; - viewer_core_2d_ = v_.core; + viewer_core_3d_ = v_.core(); + viewer_core_2d_ = v_.core(); viewer_cores_init = true; // viewer_core_3d_.show_texture = true; @@ -207,7 +207,7 @@ bool TextureGUI::pre_draw() { viewer_core_2d_.lighting_factor = 0; viewer_core_2d_.align_camera_center(d_.w_uv, d_.surface_F); - v_.core = uv_space ? viewer_core_2d_ : viewer_core_3d_; + v_.core() = uv_space ? viewer_core_2d_ : viewer_core_3d_; } v_.data().clear(); diff --git a/src/UI/TextureGUI_extended_menu.cpp b/src/UI/TextureGUI_extended_menu.cpp index f9ab366..6a50f29 100644 --- a/src/UI/TextureGUI_extended_menu.cpp +++ b/src/UI/TextureGUI_extended_menu.cpp @@ -144,11 +144,11 @@ bool TextureGUI::extended_menu() { re_draw_ = true; if (viewer_cores_init) { if (!uv_space) { - viewer_core_2d_ = v_.core; - v_.core = viewer_core_3d_; + viewer_core_2d_ = v_.core(); + v_.core() = viewer_core_3d_; } else { - viewer_core_3d_ = v_.core; - v_.core = viewer_core_2d_; + viewer_core_3d_ = v_.core(); + v_.core() = viewer_core_2d_; } } if (continue_computing_) {