Cycles: Cleanup, style and unused arguments

- Some arguments were inapproriatry tagged as unused
  using (void)foo semantic.

  Only use such semantic in tricky casses, when something
  needs to be ignored in release builds or something is
  dependent on tricky ifndef policy.

  For rest of the cases just use void foo(int /bar*/)
  semantic, which ensures variable is not used. Solves
  confusion and code running out of sync with later
  development.

- Used proper unused semantic to some arguments.

- Added braces to make code easier to follow, tricky
  indentation with ifdef, uh.

intern/cycles/device/device_cpu.cpp

@@ -532,9 +532,8 @@ public:
 
 	bool denoising_combine_halves(device_ptr a_ptr, device_ptr b_ptr,
 	                              device_ptr mean_ptr, device_ptr variance_ptr,
-	                              int r, int4 rect, DenoisingTask *task)
+	                              int r, int4 rect, DenoisingTask * /*task*/)
 	{
-		(void) task;
 		for(int y = rect.y; y < rect.w; y++) {
 			for(int x = rect.x; x < rect.z; x++) {
 				filter_combine_halves_kernel()(x, y,

intern/cycles/device/device_cuda.cpp

@@ -1148,8 +1148,6 @@ public:
 	                              device_ptr mean_ptr, device_ptr variance_ptr,
 	                              int r, int4 rect, DenoisingTask *task)
 	{
-		(void) task;
-
 		if(have_error())
 			return false;
 
@@ -1179,8 +1177,6 @@ public:
 	                             device_ptr sample_variance_ptr, device_ptr sv_variance_ptr,
 	                             device_ptr buffer_variance_ptr, DenoisingTask *task)
 	{
-		(void) task;
-
 		if(have_error())
 			return false;
 

intern/cycles/device/opencl/opencl_base.cpp

@@ -817,8 +817,6 @@ bool OpenCLDeviceBase::denoising_combine_halves(device_ptr a_ptr,
                                                 int r, int4 rect,
                                                 DenoisingTask *task)
 {
-	(void) task;
-
 	cl_mem a_mem = CL_MEM_PTR(a_ptr);
 	cl_mem b_mem = CL_MEM_PTR(b_ptr);
 	cl_mem mean_mem = CL_MEM_PTR(mean_ptr);
@@ -847,8 +845,6 @@ bool OpenCLDeviceBase::denoising_divide_shadow(device_ptr a_ptr,
                                                device_ptr buffer_variance_ptr,
                                                DenoisingTask *task)
 {
-	(void) task;
-
 	cl_mem a_mem = CL_MEM_PTR(a_ptr);
 	cl_mem b_mem = CL_MEM_PTR(b_ptr);
 	cl_mem sample_variance_mem = CL_MEM_PTR(sample_variance_ptr);

intern/cycles/render/shader.cpp

@@ -335,11 +335,14 @@ ShaderManager *ShaderManager::create(Scene *scene, int shadingsystem)
 	(void)shadingsystem;  /* Ignored when built without OSL. */
 
 #ifdef WITH_OSL
-	if(shadingsystem == SHADINGSYSTEM_OSL)
+	if(shadingsystem == SHADINGSYSTEM_OSL) {
 		manager = new OSLShaderManager();
+	}
 	else
 #endif
+	{
 		manager = new SVMShaderManager();
+	}
 	
 	add_default(scene);
 

intern/cycles/util/util_guarded_allocator.h

@@ -50,9 +50,9 @@ public:
 
 	T *allocate(size_t n, const void *hint = 0)
 	{
+		(void)hint;
 		size_t size = n * sizeof(T);
 		util_guarded_mem_alloc(size);
-		(void)hint;
 		if(n == 0) {
 			return NULL;
 		}