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

Add possibility to render USD file for testing purposes #49

Merged
Bogdan Nagirniak merged 4 commits from BLEN-428 into hydra-render 2023-06-02 13:07:31 +02:00
Conversation 3 Commits 4 Files Changed 3 +3 -19
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e475738fc3 - Show all commits

4
source/blender/render/hydra/engine.h
View File

@ -9,9 +9,9 @@
#include <pxr/imaging/hd/engine.h> #include <pxr/imaging/hd/engine.h>
#include <pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h> #include <pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h>
#include <pxr/imaging/hdx/freeCameraSceneDelegate.h> #include <pxr/imaging/hdx/freeCameraSceneDelegate.h>
#include <pxr/usdImaging/usdImaging/delegate.h>
#include <pxr/usd/usd/stage.h>
#include <pxr/imaging/hgi/hgi.h> #include <pxr/imaging/hgi/hgi.h>
#include <pxr/usd/usd/stage.h>
#include <pxr/usdImaging/usdImaging/delegate.h>
#include "RE_engine.h" #include "RE_engine.h"

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

@ -7,8 +7,8 @@
#include <pxr/base/plug/plugin.h> #include <pxr/base/plug/plugin.h>
#include <pxr/base/plug/registry.h> #include <pxr/base/plug/registry.h>
#include <pxr/usdImaging/usdImagingGL/engine.h>
#include <pxr/usd/usd/stage.h> #include <pxr/usd/usd/stage.h>
#include <pxr/usdImaging/usdImagingGL/engine.h>
#include "BKE_appdir.h" #include "BKE_appdir.h"
#include "BLI_fileops.h" #include "BLI_fileops.h"
@ -99,21 +99,6 @@ static PyObject *get_render_plugins_func(PyObject * /*self*/, PyObject *args)
return ret; return ret;
} }
static PyObject *test_func(PyObject * /*self*/, PyObject *args)
{
PyObject *pystage;
if (!PyArg_ParseTuple(args, "O", &pystage)) {
Py_RETURN_NONE;
}
boost::python::extract<pxr::UsdStageRefPtr> e(pystage);
pxr::UsdStagePtr stage = e();
std::string str;
stage->ExportToString(&str);
printf("%s", str.c_str());
Py_RETURN_NONE;
}
static PyObject *engine_create_func(PyObject * /*self*/, PyObject *args) static PyObject *engine_create_func(PyObject * /*self*/, PyObject *args)
{ {
PyObject *pyengine; PyObject *pyengine;
@ -291,7 +276,6 @@ static PyMethodDef methods[] = {
{"init", init_func, METH_VARARGS, ""}, {"init", init_func, METH_VARARGS, ""},
{"register_plugins", register_plugins_func, METH_VARARGS, ""}, {"register_plugins", register_plugins_func, METH_VARARGS, ""},
{"get_render_plugins", get_render_plugins_func, METH_VARARGS, ""}, {"get_render_plugins", get_render_plugins_func, METH_VARARGS, ""},
{"test", test_func, METH_VARARGS, ""},
{"engine_create", engine_create_func, METH_VARARGS, ""}, {"engine_create", engine_create_func, METH_VARARGS, ""},
{"engine_free", engine_free_func, METH_VARARGS, ""}, {"engine_free", engine_free_func, METH_VARARGS, ""},