Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/app/cycles_standalone.cpp
| Context not available. | |||||
| #endif | #endif | ||||
| #include "cycles_xml.h" | #include "cycles_xml.h" | ||||
| #include "cycles_json.h" | |||||
| CCL_NAMESPACE_BEGIN | CCL_NAMESPACE_BEGIN | ||||
| Context not available. | |||||
| { | { | ||||
| options.scene = new Scene(options.scene_params, options.session_params.device); | options.scene = new Scene(options.scene_params, options.session_params.device); | ||||
| #if 0 | |||||
| /* Read XML */ | /* Read XML */ | ||||
| xml_read_file(options.scene, options.filepath.c_str()); | xml_read_file(options.scene, options.filepath.c_str()); | ||||
| #else | |||||
| json_read_file(options.scene, options.filepath.c_str()); | |||||
| #endif | |||||
| /* Camera width/height override? */ | /* Camera width/height override? */ | ||||
| if (!(options.width == 0 || options.height == 0)) { | if (!(options.width == 0 || options.height == 0)) { | ||||
| Context not available. | |||||