[Bf-blender-cvs] [cbf2fab] master: Cycles: Remove redundant alloc/free

Sergej Reich noreply at git.blender.org
Sat Nov 1 15:23:30 CET 2014


Commit: cbf2fab9ea51ff89845a527cf14a360faabbdd38
Author: Sergej Reich
Date:   Sat Nov 1 15:23:14 2014 +0100
Branches: master
https://developer.blender.org/rBcbf2fab9ea51ff89845a527cf14a360faabbdd38

Cycles: Remove redundant alloc/free

Seems like a copy paste error.

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

M	intern/cycles/util/util_vector.h

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

diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h
index cc6e8a3..3d88569 100644
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@@ -107,9 +107,6 @@ public:
 		if(datasize > 0) {
 			data = (T*)malloc_aligned(sizeof(T)*datasize, alignment);
 			memcpy(data, &from[0], datasize*sizeof(T));
-			free_aligned(data);
-			data = (T*)malloc_aligned(sizeof(T)*datasize, alignment);
-			memcpy(data, &from[0], datasize*sizeof(T));
 		}
 
 		return *this;




More information about the Bf-blender-cvs mailing list