[Bf-blender-cvs] [1626b20] cycles_split_kernel: Cycles: Remove unneeded lines in constructor

Mai Lavelle noreply at git.blender.org
Sun Nov 20 20:10:48 CET 2016


Commit: 1626b20a708f4be1312f4981c02c5a5379d273ab
Author: Mai Lavelle
Date:   Sun Nov 20 13:17:12 2016 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB1626b20a708f4be1312f4981c02c5a5379d273ab

Cycles: Remove unneeded lines in constructor

Since these were added to `device_memory` we don't need them in
`device_vector` as well.

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

M	intern/cycles/device/device_memory.h

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

diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index cb97b79..483e6aa 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -208,16 +208,8 @@ public:
 	{
 		data_type = device_type_traits<T>::data_type;
 		data_elements = device_type_traits<T>::num_elements;
-		data_pointer = 0;
-		data_size = 0;
-		device_size = 0;
-		data_width = 0;
-		data_height = 0;
-		data_depth = 0;
 
 		assert(data_elements > 0);
-
-		device_pointer = 0;
 	}
 
 	virtual ~device_vector() {}




More information about the Bf-blender-cvs mailing list