[Bf-blender-cvs] [343fd70] soc-2016-cycles_denoising: Cycles Standalone: Implement the half window option

[Lukas Stockner]

Commit: 343fd7087a0ae2fcc5e3ba685d10d8a603d4421a
Author: Lukas Stockner
Date:   Sat Aug 13 03:50:27 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB343fd7087a0ae2fcc5e3ba685d10d8a603d4421a

Cycles Standalone: Implement the half window option

===================================================================

M	intern/cycles/app/cycles_standalone.cpp
M	intern/cycles/app/cycles_standalone.h

===================================================================

diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index be57a20..899f6d6 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -327,7 +327,6 @@ static void options_parse(int argc, const char **argv)
 	options.filepaths.clear();
 	options.session = NULL;
 	options.quiet = false;
-	options.half_window = 8;
 	options.denoise_frame = 0;
 
 	/* device names */
@@ -366,8 +365,8 @@ static void options_parse(int argc, const char **argv)
 		"--background", &options.session_params.background, "Render in background, without user interface",
 		"--quiet", &options.quiet, "In background mode, don't print progress messages",
 		"--denoise", &denoise, "Denoise the given input file instead of rendering it",
-		"--half-window %d", &options.half_window, "Size of the denoising window",
 		"--denoise-frame %d", &options.denoise_frame, "Which frame to denoise (first frame is 0)",
+		"--half-window %d", &options.session_params.half_window, "Size of the denoising window",
 		"--samples %d", &options.session_params.samples, "Number of samples to render",
 		"--output %s", &options.session_params.output_path, "File path to write output image",
 		"--threads %d", &options.session_params.threads, "CPU Rendering Threads",
diff --git a/intern/cycles/app/cycles_standalone.h b/intern/cycles/app/cycles_standalone.h
index b6af271..d247c83 100644
--- a/intern/cycles/app/cycles_standalone.h
+++ b/intern/cycles/app/cycles_standalone.h
@@ -33,7 +33,6 @@ struct Options {
 	SessionParams session_params;
 	bool quiet;
 	bool show_help, interactive, pause;
-	int half_window;
 	int denoise_frame;
 };