Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
77e39c21
Commit
77e39c21
authored
3 months ago
by
Milan Jaros
Browse files
Options
Downloads
Patches
Plain Diff
fix
parent
a703f15e
No related branches found
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
intern/cycles/scene/node_write_xml.cpp
+4
-1
4 additions, 1 deletion
intern/cycles/scene/node_write_xml.cpp
intern/cycles/scene/scene_write_xml.cpp
+14
-14
14 additions, 14 deletions
intern/cycles/scene/scene_write_xml.cpp
with
18 additions
and
15 deletions
intern/cycles/scene/node_write_xml.cpp
+
4
−
1
View file @
77e39c21
...
@@ -430,7 +430,10 @@ void xml_write_node_socket(XMLWriter& writer, Node* node, xml_node xml_root, con
...
@@ -430,7 +430,10 @@ void xml_write_node_socket(XMLWriter& writer, Node* node, xml_node xml_root, con
Transform
tfm
=
node
->
get_transform
(
socket
);
Transform
tfm
=
node
->
get_transform
(
socket
);
Object
*
ob
=
dynamic_cast
<
Object
*>
(
node
);
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
;
std
::
stringstream
ss
;
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
if
(
i
==
2
)
if
(
i
==
2
)
...
...
This diff is collapsed.
Click to expand it.
intern/cycles/scene/scene_write_xml.cpp
+
14
−
14
View file @
77e39c21
...
@@ -1083,19 +1083,19 @@ void scene_write_xml_geom(XMLWriteState& state, xml_node node)
...
@@ -1083,19 +1083,19 @@ void scene_write_xml_geom(XMLWriteState& state, xml_node node)
/* Light */
/* Light */
void
scene_write_xml_light
(
XMLWriteState
&
state
,
xml_node
node
)
//
void scene_write_xml_light(XMLWriteState& state, xml_node node)
{
//
{
//Light* light = new Light();
//
//Light* light = new Light();
//
//light->set_shader(state.shader);
//
//light->set_shader(state.shader);
for
(
Light
*
light
:
state
.
scene
->
lights
)
{
//
for(Light * light: state.scene->lights) {
//xml_node xml_node = node.append_child(light->type->name.c_str());
//
//xml_node xml_node = node.append_child(light->type->name.c_str());
//if (light->get_light_type() != LIGHT_BACKGROUND)
//
//if (light->get_light_type() != LIGHT_BACKGROUND)
xml_write_node
(
state
,
light
,
node
);
//
xml_write_node(state, light, node);
}
//
}
//
//state.scene->lights.push_back(light);
//
//state.scene->lights.push_back(light);
}
//
}
void
scene_write_xml_particle_systems
(
XMLWriteState
&
state
,
xml_node
node
)
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)
...
@@ -1297,7 +1297,7 @@ void scene_write_xml_scene(XMLWriteState& state, xml_node scene_node)
scene_write_xml_shader
(
state
,
scene_node
);
scene_write_xml_shader
(
state
,
scene_node
);
// }
// }
// else if (string_iequals(node.name(), "light")) {
// 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")) {
// else if (string_iequals(node.name(), "mesh")) {
//xml_node mesh = scene_node.append_child("mesh");
//xml_node mesh = scene_node.append_child("mesh");
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment