Differential D36 Diff 85 intern/cycles/render/session.cpp

Changeset View

Standalone View

intern/cycles/render/session.cpp

Context not available.
	wait();	wait();
	}	}

	if(display && params.output_path != "") {	if(display && !params.output_path.empty()) {
	tonemap();	tonemap();

	progress.set_status("Writing Image", params.output_path);	progress.set_status("Writing Image", params.output_path);
Context not available.
	/* update scene */	/* update scene */
	update_scene();	update_scene();

	if(device->error_message() != "")	if(!device->error_message().empty())
	progress.set_cancel(device->error_message());	progress.set_cancel(device->error_message());

	if(progress.get_cancel())	if(progress.get_cancel())
Context not available.

	device->task_wait();	device->task_wait();

	if(device->error_message() != "")	if(!device->error_message().empty())
	progress.set_cancel(device->error_message());	progress.set_cancel(device->error_message());

	/* update status and timing */	/* update status and timing */
Context not available.
	}	}
	}	}

	if(device->error_message() != "")	if(!device->error_message().empty())
	progress.set_cancel(device->error_message());	progress.set_cancel(device->error_message());

	tiles_written = update_progressive_refine(progress.get_cancel());	tiles_written = update_progressive_refine(progress.get_cancel());
Context not available.
	/* update scene */	/* update scene */
	update_scene();	update_scene();

	if(device->error_message() != "")	if(!device->error_message().empty())
	progress.set_cancel(device->error_message());	progress.set_cancel(device->error_message());

	if(progress.get_cancel())	if(progress.get_cancel())
Context not available.
	if(!params.background)	if(!params.background)
	need_tonemap = true;	need_tonemap = true;

	if(device->error_message() != "")	if(!device->error_message().empty())
	progress.set_cancel(device->error_message());	progress.set_cancel(device->error_message());
	}	}

Context not available.
	tonemap();	tonemap();
	}	}

	if(device->error_message() != "")	if(!device->error_message().empty())
	progress.set_cancel(device->error_message());	progress.set_cancel(device->error_message());

	tiles_written = update_progressive_refine(progress.get_cancel());	tiles_written = update_progressive_refine(progress.get_cancel());
Context not available.

	if(!device->load_kernels(params.experimental)) {	if(!device->load_kernels(params.experimental)) {
	string message = device->error_message();	string message = device->error_message();
	if(message == "")	if(message.empty())
	message = "Failed loading render kernel, see console for errors";	message = "Failed loading render kernel, see console for errors";

	progress.set_status("Error", message);	progress.set_status("Error", message);
Context not available.
	}	}
	else {	else {
	status = substatus;	status = substatus;
	substatus = "";	substatus.clear();
	}	}

	progress.set_status(status, substatus);	progress.set_status(status, substatus);
Context not available.