[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31032] trunk/blender/source/blender/ makesrna/intern/rna_sculpt_paint.c: Fix crash accessing particle edit values outside of particle edit mode.

[Brecht Van Lommel]

Revision: 31032
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31032
Author:   blendix
Date:     2010-08-04 11:20:59 +0200 (Wed, 04 Aug 2010)

Log Message:
-----------
Fix crash accessing particle edit values outside of particle edit mode.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2010-08-04 08:58:38 UTC (rev 31031)
+++ trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2010-08-04 09:20:59 UTC (rev 31032)
@@ -134,7 +134,7 @@
 	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
 	
 	/* redraw hair completely if weight brush is/was used */
-	if(pset->brushtype == PE_BRUSH_WEIGHT || value == PE_BRUSH_WEIGHT) {
+	if((pset->brushtype == PE_BRUSH_WEIGHT || value == PE_BRUSH_WEIGHT) && pset->scene) {
 		Object *ob = (pset->scene->basact)? pset->scene->basact->object: NULL;
 		if(ob) {
 			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
@@ -164,15 +164,19 @@
 {
 	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
 
-	return (pset->object && PE_get_current(pset->scene, pset->object));
+	return (pset->object && pset->scene && PE_get_current(pset->scene, pset->object));
 }
 static int rna_ParticleEdit_hair_get(PointerRNA *ptr)
 {
 	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
 
-	PTCacheEdit *edit = PE_get_current(pset->scene, pset->object);
+	if(pset->scene) {
+		PTCacheEdit *edit = PE_get_current(pset->scene, pset->object);
 
-	return (edit && edit->psys);
+		return (edit && edit->psys);
+	}
+	
+	return 0;
 }
 
 static void rna_Paint_active_brush_index_set(PointerRNA *ptr, int value)