Skip to content

Commit

Permalink
Fixed scene creation from LXS in pyluxcoretools console
Browse files Browse the repository at this point in the history
  • Loading branch information
Dade916 committed Apr 11, 2019
1 parent 6e4635d commit e52c50f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion release-notes.txt
Expand Up @@ -25,7 +25,6 @@
* Added the support for nested groups to LXS parser
* Added the support for persistent PhotonGI cache on file
* Added the support for using persistent PhotonGI cache across multiple frames for fly-through animations
* Fixed LXS parsing of point light source position
* DLSC now automatically estimated the best radius if lightstrategy.entry.radius is set to 0.0
* New improved Random/Sobol sampler adaptive code
* LXS parser now supports halttime and haltspp film halt conditions
Expand All @@ -49,6 +48,7 @@
* Fixed LXS parsing in pyluxcoretools
* Fixed a problem when mixing transparent and solid materials with Mix (issue #183)
* Fix a bug when using glossy coating with any specular material
* Fixed LXS parsing of point light source position

Check https://wiki.luxcorerender.org/LuxCoreRender_Release_Notes for the full list
of release notes.
Expand Down
2 changes: 1 addition & 1 deletion src/luxcore/pyluxcore.cpp
Expand Up @@ -503,7 +503,7 @@ static luxrays::Property Properties_GetWithDefaultValues(luxrays::Properties *pr
throw runtime_error("Unsupported data type included in Properties Get with default method: " + objType);
}

return luxrays::Property(name, values);
return props->Get(luxrays::Property(name, values));
}

void Properties_DeleteAll(luxrays::Properties *props, const boost::python::list &l) {
Expand Down
7 changes: 5 additions & 2 deletions src/pyluxcoretools/pyluxcoretools/pyluxcoreconsole/cmd.py
Expand Up @@ -115,9 +115,12 @@ def LuxCoreConsole(argv):
configProps = pyluxcore.Properties()
sceneProps = pyluxcore.Properties()
pyluxcore.ParseLXS(args.fileToRender, configProps, sceneProps)

configProps.Set(cmdLineProp);
config = pyluxcore.RenderConfig(configProps)

scene = pyluxcore.Scene(configProps.Get("images.scale", [1.0]).GetFloat())
scene.Parse(sceneProps)

config = pyluxcore.RenderConfig(configProps, scene)
elif (configFileNameExt == ".cfg"):
# It is a LuxCore SDL file
configProps = pyluxcore.Properties(args.fileToRender)
Expand Down

0 comments on commit e52c50f

Please sign in to comment.