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

BLEN-335: Export environment light #1

Merged
Bogdan Nagirniak merged 13 commits from BLEN-335 into hydra-render 2023-02-17 14:46:46 +01:00
Conversation 0 Commits 13 Files Changed 9 +8 -8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a9dbaa1207 - Show all commits

14
source/blender/render/hydra/sceneDelegate/blenderSceneDelegate.cc
View File

@ -50,14 +50,14 @@ void BlenderSceneDelegate::update_material(Material *material)
} }
} }
void BlenderSceneDelegate::add_world(View3DShading &view3DShading, World &world) void BlenderSceneDelegate::add_world(View3DShading *view3DShading, World *world)
{ {
SdfPath world_light_id = world_id(&view3DShading); SdfPath world_light_id = world_id(view3DShading);
LOG(INFO) << "Add world: " << world_light_id; LOG(INFO) << "Add world: " << world_light_id;
if (world_data.shading != &view3DShading || world_data.world != &world) { if (world_data.shading != view3DShading || world_data.world != world) {
world_data = WorldData(&view3DShading, &world); world_data = WorldData(view3DShading, world);
GetRenderIndex().InsertSprim(HdPrimTypeTokens->domeLight, this, world_light_id); GetRenderIndex().InsertSprim(HdPrimTypeTokens->domeLight, this, world_light_id);
} }
else { else {
@ -262,7 +262,7 @@ void BlenderSceneDelegate::Populate(BL::Depsgraph &b_deps, View3D *v3d)
World *world = (World *)b_depsgraph->scene().world().ptr.data; World *world = (World *)b_depsgraph->scene().world().ptr.data;
add_world(view3d->shading, *world); add_world(&view3d->shading, world);
is_populated = true; is_populated = true;
return; return;
@ -315,13 +315,13 @@ void BlenderSceneDelegate::Populate(BL::Depsgraph &b_deps, View3D *v3d)
if (id.is_a(&RNA_World)) { if (id.is_a(&RNA_World)) {
World *world = (World *)b_depsgraph->scene().world().ptr.data; World *world = (World *)b_depsgraph->scene().world().ptr.data;
add_world(view3d->shading, *world); add_world(&view3d->shading, world);
continue; continue;
} }
if (id.is_a(&RNA_ShaderNodeTree)) { if (id.is_a(&RNA_ShaderNodeTree)) {
World *world = (World *)b_depsgraph->scene().world().ptr.data; World *world = (World *)b_depsgraph->scene().world().ptr.data;
add_world(view3d->shading, *world); add_world(&view3d->shading, world);
continue; continue;
} }
} }

2
source/blender/render/hydra/sceneDelegate/blenderSceneDelegate.h
View File

@ -50,7 +50,7 @@ private:
void update_material(Material *material); void update_material(Material *material);
void update_collection(); void update_collection();
void update_visibility(); void update_visibility();
void add_world(View3DShading &view3DShading, World &world); void add_world(View3DShading *view3DShading, World *world);
SdfPath world_id(View3DShading *view3DShading); SdfPath world_id(View3DShading *view3DShading);
private: private: