Merge branch 'blender-v5.0-release'
This commit is contained in:
@@ -34,9 +34,19 @@ class CompositorRuntime {
|
||||
~CompositorRuntime();
|
||||
};
|
||||
|
||||
/* Runtime data specific to the sequencer, e.g. when using scene strips. */
|
||||
class SequencerRuntime {
|
||||
public:
|
||||
Depsgraph *depsgraph = nullptr;
|
||||
|
||||
~SequencerRuntime();
|
||||
};
|
||||
|
||||
class SceneRuntime : NonCopyable, NonMovable {
|
||||
public:
|
||||
CompositorRuntime compositor;
|
||||
|
||||
SequencerRuntime sequencer;
|
||||
};
|
||||
|
||||
} // namespace blender::bke
|
||||
|
||||
@@ -114,6 +114,7 @@
|
||||
|
||||
using blender::bke::CompositorRuntime;
|
||||
using blender::bke::SceneRuntime;
|
||||
using blender::bke::SequencerRuntime;
|
||||
|
||||
CompositorRuntime::~CompositorRuntime()
|
||||
{
|
||||
@@ -122,6 +123,11 @@ CompositorRuntime::~CompositorRuntime()
|
||||
}
|
||||
}
|
||||
|
||||
SequencerRuntime::~SequencerRuntime()
|
||||
{
|
||||
DEG_graph_free(depsgraph);
|
||||
}
|
||||
|
||||
CurveMapping *BKE_sculpt_default_cavity_curve()
|
||||
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user