Merge pull request #679 from LuxCoreRender/bugfix_v2.10

Bugfix v2.10 (for v2.10.1)

Author: howetuft

.github/workflows/sample-builder.yml

@@ -240,6 +240,8 @@ jobs:
             rm miniconda3/miniconda.sh
             source miniconda3/bin/activate
             conda init --all
+            conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
+            conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
 
             # Install gh
             conda install conda-forge::gh --channel conda-forge -y

pyproject.toml

@@ -12,9 +12,9 @@ dynamic = ["version"]
 dependencies = [
   "numpy >= 2; python_version > '3.8'",
   "numpy < 2; python_version <= '3.8'",
-  "nvidia-cuda-nvrtc-cu12; sys_platform != 'darwin'",
+  "nvidia-cuda-nvrtc-cu12 == 12.8.93; sys_platform != 'darwin'",
 ]
-requires-python = ">= 3.8"
+requires-python = ">= 3.9"
 description = "LuxCore Python bindings"
 authors = [{name="LuxCoreRender"}]
 ## See https://pypi.org/classifiers/

samples/luxcoreui/luxcoreapp.cpp

@@ -243,11 +243,11 @@ void LuxCoreApp::SetFilmResolution(const unsigned int width, const unsigned int
 	StartRendering();
 }
 
-void LuxCoreApp::LoadRenderConfig(const std::string &fileName) {
+void LuxCoreApp::LoadRenderConfig(const std::string &fileName, const std::string &filePath) {
 	DeleteRendering();
 
 	// Set the current directory to place where the configuration file is
-	boost::filesystem::current_path(boost::filesystem::path(fileName).parent_path());
+	boost::filesystem::current_path(boost::filesystem::path(filePath));
 
 	// Clear the file name resolver list
 	luxcore::ClearFileNameResolverPaths();

samples/luxcoreui/luxcoreapp.h

@@ -106,7 +106,7 @@ class LuxCoreApp {
 	void DecScreenRefreshInterval();
 	void CloseAllRenderConfigEditors();
 
-	void LoadRenderConfig(const std::string &configFileName);
+	void LoadRenderConfig(const std::string &configFileName, const std::string &configFilePath);
 	void StartRendering(luxcore::RenderState *startState = NULL, luxcore::Film *startFilm = NULL);
 	void DeleteRendering();
 

samples/luxcoreui/uimenu.cpp

@@ -39,7 +39,8 @@ static void KernelCacheFillProgressHandler(const size_t step, const size_t count
 enum fileBrowserType { open, save, save_directory };
 
 bool fileBrowser(
-    string &fileName,
+    std::string &fileNamePath,
+    std::string &filePath,
     const std::string &prompt,
     const std::vector<std::string> &filterList,
     fileBrowserType type
@@ -87,11 +88,13 @@ bool fileBrowser(
     {
       if (type != fileBrowserType::save_directory)
       {
-        fileName = fd->GetFilePathName();
+        fileNamePath = fd->GetFilePathName();
+        filePath = fd->GetCurrentPath();
       }
       else
       {
-        fileName = fd->GetCurrentPath();
+        fileNamePath = fd->GetCurrentPath();
+        filePath = fd->GetCurrentPath();
       }
     }
 
@@ -553,6 +556,7 @@ void LuxCoreApp::MainMenuBar() {
     // File Dialogs
     if (showLoadFileDialog) {
       std::string fileToLoad;
+      std::string fileToLoad_path;
       static const std::vector<std::string> filterLoad = {
         "LuxCore scenes (.cfg,.bcf,.lxs){.cfg,.bcf,.lxs}",
         "LuxCore scene - text (.cfg){.cfg}",
@@ -562,21 +566,24 @@ void LuxCoreApp::MainMenuBar() {
 
       if (fileBrowser(
             fileToLoad,
+            fileToLoad_path,
             "Select File to Load",
             filterLoad,
             fileBrowserType::open ))
       {
         showLoadFileDialog = false;
-        LoadRenderConfig(fileToLoad);
+        LoadRenderConfig(fileToLoad, fileToLoad_path);
       }
     }
 
     if (showExportFileDialog) {
       std::string fileToExport;
+      std::string fileToExport_path;
       static const std::vector<std::string> filterExport = {"All (.*){.*}"};
 
       if (fileBrowser(
             fileToExport,
+            fileToExport_path,
             "Select Directory to Export",
             filterExport,
             fileBrowserType::save_directory))
@@ -605,12 +612,14 @@ void LuxCoreApp::MainMenuBar() {
     if (showExportBinaryFileDialog)
     {
       std::string fileToExport;
+      std::string fileToExport_path;
       static const std::vector<std::string> filterExport = {
         "LuxCore exported scene (.bcf){.bcf}"
       };
 
       if (fileBrowser(
             fileToExport,
+            fileToExport_path,
             "Select File to Export",
             filterExport,
             fileBrowserType::save))
@@ -624,13 +633,15 @@ void LuxCoreApp::MainMenuBar() {
     if (showExportGltfFileDialog)
     {
       std::string fileToExport;
+      std::string fileToExport_path;
       static const std::vector<std::string> filterExport = {
         "glTF files (.glTF,.gltf){.glTF,.gltf}",
         "All files (.*){.*}",
       };
 
       if (fileBrowser(
             fileToExport,
+            fileToExport_path,
             "Select File to Export",
             filterExport,
             fileBrowserType::save))
@@ -644,13 +655,15 @@ void LuxCoreApp::MainMenuBar() {
     if (showSaveRenderingFileDialog)
     {
       std::string fileToExport;
+      std::string fileToExport_path;
       static const std::vector<std::string> filterExport = {
         "LuxCore resume files (.rsm){.rsm}",
         "All files (.*){.*}",
       };
 
       if (fileBrowser(
             fileToExport,
+            fileToExport_path,
             "Select File to Save",
             filterExport,
             fileBrowserType::save))
@@ -672,19 +685,21 @@ void LuxCoreApp::MainMenuBar() {
     if (showResumeRenderingFileDialog)
     {
       std::string fileToLoad;
+      std::string fileToLoad_path;
       static const std::vector<std::string> filterExport = {
         "LuxCore resume files (.rsm){.rsm}",
         "All files (.*){.*}",
       };
 
       if (fileBrowser(
             fileToLoad,
+            fileToLoad_path,
             "Select File to Load",
             filterExport,
             fileBrowserType::open))
       {
         showResumeRenderingFileDialog = false;
-        LoadRenderConfig(fileToLoad);
+        LoadRenderConfig(fileToLoad, fileToLoad_path);
       }
     } // Resume Rendering