[Bf-blender-cvs] [3415ec7] cycles-ptex-06: Fix assert crash

Nicholas Bishop noreply at git.blender.org
Thu Jan 15 20:13:37 CET 2015


Commit: 3415ec767b05e4432e303040277c439cbdefeb86
Author: Nicholas Bishop
Date:   Thu Jan 15 19:57:24 2015 +0100
Branches: cycles-ptex-06
https://developer.blender.org/rB3415ec767b05e4432e303040277c439cbdefeb86

Fix assert crash

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index ecaf3f9..ba83c2a 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -1392,11 +1392,11 @@ void ImageManager::device_free(Device *device, DeviceScene *dscene)
 
 	device->tex_free(dscene->tex_image_packed);
 	device->tex_free(dscene->tex_image_packed_info);
-
-	dscene->ptex_table.clear();
+	device->tex_free(dscene->ptex_table);
 
 	dscene->tex_image_packed.clear();
 	dscene->tex_image_packed_info.clear();
+	dscene->ptex_table.clear();
 
 	images.clear();
 	float_images.clear();




More information about the Bf-blender-cvs mailing list