[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54343] trunk/blender/source/blender/ render/intern/source/bake.c: fix [#34125] Crash when bake margin = 0

Campbell Barton ideasman42 at gmail.com
Wed Feb 6 01:48:18 CET 2013


Revision: 54343
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54343
Author:   campbellbarton
Date:     2013-02-06 00:48:17 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
fix [#34125] Crash when bake margin = 0
regression since 2.65, just missing NULL check.

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-02-05 21:51:20 UTC (rev 54342)
+++ trunk/blender/source/blender/render/intern/source/bake.c	2013-02-06 00:48:17 UTC (rev 54343)
@@ -1072,12 +1072,14 @@
 				if (!ibuf)
 					continue;
 
-				userdata = (BakeImBufuserData *) ibuf->userdata;
-				RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, re->r.bake_filter);
+				if (userdata) {
+					userdata = (BakeImBufuserData *) ibuf->userdata;
+					RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, re->r.bake_filter);
 
-				if (use_displacement_buffer) {
-					RE_bake_ibuf_normalize_displacement(ibuf, userdata->displacement_buffer, userdata->mask_buffer,
-					                                    displacement_min, displacement_max);
+					if (use_displacement_buffer) {
+						RE_bake_ibuf_normalize_displacement(ibuf, userdata->displacement_buffer, userdata->mask_buffer,
+						                                    displacement_min, displacement_max);
+					}
 				}
 
 				ibuf->userflags |= IB_BITMAPDIRTY;




More information about the Bf-blender-cvs mailing list