BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Caching generated image leads to infinite loop in preview render #53

Merged
Bogdan Nagirniak merged 12 commits from BLEN-409 into hydra-render 2023-06-13 18:39:39 +02:00
Conversation 0 Commits 12 Files Changed 4 +7 -11
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c07e52b59 - Show all commits

4
source/blender/render/hydra/python.cc
View File

@ -16,8 +16,8 @@
#include "final_engine.h" #include "final_engine.h"
#include "preview_engine.h" #include "preview_engine.h"
#include "viewport_engine.h"
#include "scene_delegate/image.h" #include "scene_delegate/image.h"
#include "viewport_engine.h"
namespace blender::render::hydra { namespace blender::render::hydra {
@ -269,7 +269,7 @@ static PyObject *engine_set_render_setting_func(PyObject * /*self*/, PyObject *a
static PyObject *cache_image_func(PyObject * /*self*/, PyObject *args) static PyObject *cache_image_func(PyObject * /*self*/, PyObject *args)
{ {
PyObject *pycontext, *pyscene ,*pyimage; PyObject *pycontext, *pyscene, *pyimage;
if (!PyArg_ParseTuple(args, "OOO", &pycontext, &pyscene, &pyimage)) { if (!PyArg_ParseTuple(args, "OOO", &pycontext, &pyscene, &pyimage)) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }

8
source/blender/render/hydra/scene_delegate/image.cc
View File

@ -5,8 +5,8 @@
#include "BKE_appdir.h" #include "BKE_appdir.h"
#include "BKE_image.h" #include "BKE_image.h"
#include "BKE_image_save.h"
#include "BKE_image_format.h" #include "BKE_image_format.h"
#include "BKE_image_save.h"
#include "BLI_fileops.h" #include "BLI_fileops.h"
#include "BLI_path_util.h" #include "BLI_path_util.h"
@ -17,10 +17,8 @@
namespace blender::render::hydra { namespace blender::render::hydra {
std::string cache_image_file(Image *image, std::string cache_image_file(
bContext *context, Scene *scene, Image *image, bContext *context, Scene *scene, ImageUser *iuser, bool check_exist)
ImageUser *iuser,
bool check_exist)
{ {
std::string file_path(FILE_MAX, 0); std::string file_path(FILE_MAX, 0);
Main *main = CTX_data_main(context); Main *main = CTX_data_main(context);

6
source/blender/render/hydra/scene_delegate/image.h
View File

@ -10,10 +10,8 @@ namespace blender::render::hydra {
class BlenderSceneDelegate; class BlenderSceneDelegate;
std::string cache_image_file(Image *image, std::string cache_image_file(
bContext *context, Scene *scene, Image *image, bContext *context, Scene *scene, ImageUser *iuser, bool check_exist);
ImageUser *iuser,
bool check_exist);
std::string cache_or_get_image_file(Image *image, std::string cache_or_get_image_file(Image *image,
BlenderSceneDelegate *scene_delegate, BlenderSceneDelegate *scene_delegate,