[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60256] trunk/blender/source/blender/ render/intern/source/bake.c: Fix for displacement bake buffer might be allocated twice

Sergey Sharybin sergey.vfx at gmail.com
Fri Sep 20 11:28:53 CEST 2013


Revision: 60256
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60256
Author:   nazgul
Date:     2013-09-20 09:28:52 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Fix for displacement bake buffer might be allocated twice

Issue was caused by missing NULL-pointer check in user-data
initialization.

This issue might have lead to wrong displacement map being
baked.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/bake.c

Modified: trunk/blender/source/blender/render/intern/source/bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/bake.c	2013-09-20 09:10:17 UTC (rev 60255)
+++ trunk/blender/source/blender/render/intern/source/bake.c	2013-09-20 09:28:52 UTC (rev 60256)
@@ -828,8 +828,11 @@
 				}
 			}
 
-			if (bs->use_displacement_buffer)
-				userdata->displacement_buffer = MEM_callocN(sizeof(float) * bs->rectx * bs->recty, "BakeDisp");
+			if (bs->use_displacement_buffer) {
+				if (userdata->displacement_buffer == NULL) {
+					userdata->displacement_buffer = MEM_callocN(sizeof(float) * bs->rectx * bs->recty, "BakeDisp");
+				}
+			}
 
 			bs->ibuf->userdata = userdata;
 




More information about the Bf-blender-cvs mailing list