[Bf-blender-cvs] [83877632a37] master: Fix one more assert being triggered due to recent changes.

Brecht Van Lommel noreply at git.blender.org
Wed Oct 25 02:53:23 CEST 2017


Commit: 83877632a37af921d94811f47798c65520974a92
Author: Brecht Van Lommel
Date:   Wed Oct 25 01:22:16 2017 +0200
Branches: master
https://developer.blender.org/rB83877632a37af921d94811f47798c65520974a92

Fix one more assert being triggered due to recent changes.

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

M	intern/cycles/device/device_memory.h

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

diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index 09b6602a102..6bef6a9d5cc 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -296,13 +296,13 @@ public:
 			device_free();
 			host_free(data_pointer, sizeof(T)*data_size);
 			data_pointer = host_alloc(sizeof(T)*new_size);
+			assert(device_pointer == 0);
 		}
 
 		data_size = new_size;
 		data_width = width;
 		data_height = height;
 		data_depth = depth;
-		assert(device_pointer == 0);
 
 		return get_data();
 	}



More information about the Bf-blender-cvs mailing list