[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14448] trunk/blender/source/blender/ render/intern/source/rendercore.c:

[Brecht Van Lommel]

Revision: 14448
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14448
Author:   blendix
Date:     2008-04-17 14:11:15 +0200 (Thu, 17 Apr 2008)

Log Message:
-----------

Fix for bug #9075: the crash with stars rendering was not
completely fixed yet.

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

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2008-04-17 09:49:15 UTC (rev 14447)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2008-04-17 12:11:15 UTC (rev 14448)
@@ -182,7 +182,7 @@
 		amount+= amountm;
 		
 		zz= calchalo_z(har, ps->z);
-		if((zz> har->zs) || (har->mat->mode & MA_HALO_SOFT)) {
+		if((zz> har->zs) || (har->mat && (har->mat->mode & MA_HALO_SOFT))) {
 			if(shadeHaloFloat(har, col, zz, dist, xn, yn, flarec)) {
 				flarec= 0;
 
@@ -300,7 +300,7 @@
 							}
 							else {
 								zz= calchalo_z(har, *rz);
-								if((zz> har->zs) || (har->mat->mode & MA_HALO_SOFT)) {
+								if((zz> har->zs) || (har->mat && (har->mat->mode & MA_HALO_SOFT))) {
 									if(shadeHaloFloat(har, col, zz, dist, xn, yn, har->flarec)) {
 										for(sample=0; sample<totsample; sample++)
 											addalphaAddfacFloat(rlpp[sample]->rectf + od*4, col, har->add);