Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-04-17 08:01:13 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-04-29 20:19:19 +0300
commit9b92ce9dc00971cd9f7f0d0ba6109a9cba2090bd (patch)
treeba6189d6c4a8872f4cc48a88c5a39730012c44b2 /intern/cycles/hydra/session.cpp
parent060a50a5f72a0ccdb754bf155aa2ed394a1bcda5 (diff)
Cycles: add USD as a file format for Cycles standalone rendering
Long term, this should replace the XML format. This reuses the Hydra render delegate implementation, and so supports the same features. The same command line options and GUI work for both XML and USD also. The implementation of this is still disabled, waiting for some refactoring of USD library linking. However we want the Cycles code to be in sync between repositories for the 3.2 release. Ref T96731
Diffstat (limited to 'intern/cycles/hydra/session.cpp')
-rw-r--r--intern/cycles/hydra/session.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/hydra/session.cpp b/intern/cycles/hydra/session.cpp
index f6865bdedd1..91853dc1104 100644
--- a/intern/cycles/hydra/session.cpp
+++ b/intern/cycles/hydra/session.cpp
@@ -36,12 +36,13 @@ SceneLock::~SceneLock()
{
}
-HdCyclesSession::HdCyclesSession(Session *session_) : session(session_), _ownCyclesSession(false)
+HdCyclesSession::HdCyclesSession(Session *session_, const bool keep_nodes)
+ : session(session_), keep_nodes(true), _ownCyclesSession(false)
{
}
HdCyclesSession::HdCyclesSession(const SessionParams &params)
- : session(new Session(params, SceneParams())), _ownCyclesSession(true)
+ : session(new Session(params, SceneParams())), keep_nodes(false), _ownCyclesSession(true)
{
Scene *const scene = session->scene;