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 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 75f18b7479 - Show all commits

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

@ -3,7 +3,7 @@
#include <pxr/usdImaging/usdVolImaging/tokens.h> #include <pxr/usdImaging/usdVolImaging/tokens.h>
#include "BKE_mesh.hh" #include "BKE_mesh.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "BLI_path_util.h" #include "BLI_path_util.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
@ -56,7 +56,7 @@ void VolumeModifierData::init()
filepath_ = get_cached_file_path(modifier_->domain->cache_directory, filepath_ = get_cached_file_path(modifier_->domain->cache_directory,
scene_delegate_->scene->r.cfra); scene_delegate_->scene->r.cfra);
ID_LOG(1, "%s", filepath_.c_str()); ID_LOG(1, "%s", filepath_.c_str());
for (auto &grid_name : pxr::grid_tokens_->allTokens) { for (auto &grid_name : pxr::grid_tokens_->allTokens) {
field_descriptors_.emplace_back(grid_name, field_descriptors_.emplace_back(grid_name,
pxr::UsdVolImagingTokens->openvdbAsset, pxr::UsdVolImagingTokens->openvdbAsset,

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

@ -3,8 +3,6 @@
#pragma once #pragma once
#include <pxr/imaging/hd/sceneDelegate.h>
#include "DNA_fluid_types.h" #include "DNA_fluid_types.h"
#include "volume.h" #include "volume.h"