From 77e39c216523513a0ec35bd9f57fb461a80a38e3 Mon Sep 17 00:00:00 2001
From: Milan Jaros <milan.jaros@vsb.cz>
Date: Thu, 10 Apr 2025 09:54:23 +0200
Subject: [PATCH] fix
---
intern/cycles/scene/node_write_xml.cpp | 5 ++++-
intern/cycles/scene/scene_write_xml.cpp | 28 ++++++++++++-------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/intern/cycles/scene/node_write_xml.cpp b/intern/cycles/scene/node_write_xml.cpp
index b4e05bb3810..d854f2fad71 100644
--- a/intern/cycles/scene/node_write_xml.cpp
+++ b/intern/cycles/scene/node_write_xml.cpp
@@ -430,7 +430,10 @@ void xml_write_node_socket(XMLWriter& writer, Node* node, xml_node xml_root, con
Transform tfm = node->get_transform(socket);
Object* ob = dynamic_cast<Object*>(node);
- if (!ob || ob->get_geometry() && (ob->get_geometry()->geometry_type == Geometry::Type::VOLUME || !ob->get_geometry()->transform_applied)) {
+ if (!ob || ob->get_geometry() && (
+ ob->get_geometry()->geometry_type == Geometry::Type::VOLUME
+ || ob->get_geometry()->geometry_type == Geometry::Type::LIGHT
+ || !ob->get_geometry()->transform_applied)) {
std::stringstream ss;
for (int i = 0; i < 3; i++) {
if (i == 2)
diff --git a/intern/cycles/scene/scene_write_xml.cpp b/intern/cycles/scene/scene_write_xml.cpp
index cba15e934a3..bee78eb02fd 100644
--- a/intern/cycles/scene/scene_write_xml.cpp
+++ b/intern/cycles/scene/scene_write_xml.cpp
@@ -1083,19 +1083,19 @@ void scene_write_xml_geom(XMLWriteState& state, xml_node node)
/* Light */
-void scene_write_xml_light(XMLWriteState& state, xml_node node)
-{
- //Light* light = new Light();
-
- //light->set_shader(state.shader);
- for(Light * light: state.scene->lights) {
- //xml_node xml_node = node.append_child(light->type->name.c_str());
- //if (light->get_light_type() != LIGHT_BACKGROUND)
- xml_write_node(state, light, node);
- }
-
- //state.scene->lights.push_back(light);
-}
+//void scene_write_xml_light(XMLWriteState& state, xml_node node)
+//{
+// //Light* light = new Light();
+//
+// //light->set_shader(state.shader);
+// for(Light * light: state.scene->lights) {
+// //xml_node xml_node = node.append_child(light->type->name.c_str());
+// //if (light->get_light_type() != LIGHT_BACKGROUND)
+// xml_write_node(state, light, node);
+// }
+//
+// //state.scene->lights.push_back(light);
+//}
void scene_write_xml_particle_systems(XMLWriteState& state, xml_node node)
{
@@ -1297,7 +1297,7 @@ void scene_write_xml_scene(XMLWriteState& state, xml_node scene_node)
scene_write_xml_shader(state, scene_node);
// }
// else if (string_iequals(node.name(), "light")) {
- scene_write_xml_light(state, scene_node);
+ //scene_write_xml_light(state, scene_node);
// }
// else if (string_iequals(node.name(), "mesh")) {
//xml_node mesh = scene_node.append_child("mesh");
--
GitLab