diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-13 16:48:48 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-13 16:48:48 +0300 |
| commit | 1cb6cea71c10c0d22ba9cdd3eee5111d0734c193 (patch) | |
| tree | 1cbd74c668006be134692e883ceef7286db3a368 /intern/cycles/app | |
| parent | f30a2a786214c4ef08612486c227add0bb6bf35b (diff) | |
| parent | 8a03e4d409ec71beab612facf432eb57f3bc5f34 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 3a1c7205c34..f2db9271a89 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -358,7 +358,7 @@ static void xml_read_shader(XMLReadState& state, xml_node node) /* Background */ -static void xml_read_background(XMLReadState& state, pugi::xml_node node) +static void xml_read_background(XMLReadState& state, xml_node node) { /* Background Settings */ xml_read_node(state, state.scene->background, node); |