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

Export volumes from object modifier (quick effect) #62

Merged
Bogdan Nagirniak merged 28 commits from BLEN-448 into hydra-render 2023-07-20 23:49:25 +02:00
Conversation 1 Commits 28 Files Changed 8 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83d68ba112 - Show all commits

4
source/blender/render/hydra/scene_delegate/volume_modifier.cc
View File

@ -26,8 +26,8 @@ const Set<pxr::TfToken> supported_grids = {pxr::grid_tokens_->density,
pxr::grid_tokens_->velocity}; pxr::grid_tokens_->velocity};
VolumeModifierData::VolumeModifierData(BlenderSceneDelegate *scene_delegate, VolumeModifierData::VolumeModifierData(BlenderSceneDelegate *scene_delegate,
Object *object, Object *object,
pxr::SdfPath const &prim_id) pxr::SdfPath const &prim_id)
: VolumeData(scene_delegate, object, prim_id) : VolumeData(scene_delegate, object, prim_id)
{ {
} }

5
source/blender/render/hydra/scene_delegate/volume_modifier.h
View File

@ -12,7 +12,9 @@ namespace blender::render::hydra {
class VolumeModifierData : public VolumeData { class VolumeModifierData : public VolumeData {
public: public:
VolumeModifierData(BlenderSceneDelegate *scene_delegate, Object *object, pxr::SdfPath const &prim_id); VolumeModifierData(BlenderSceneDelegate *scene_delegate,
Object *object,
pxr::SdfPath const &prim_id);
static bool is_volume_modifier(Object *object); static bool is_volume_modifier(Object *object);
void init() override; void init() override;
@ -21,7 +23,6 @@ class VolumeModifierData : public VolumeData {
void write_transform() override; void write_transform() override;
std::string get_cached_file_path(std::string directory, int frame); std::string get_cached_file_path(std::string directory, int frame);
}; };
} // namespace blender::render::hydra } // namespace blender::render::hydra