[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44421] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: remove redundant NULL check in draw_new_particle_system()

Campbell Barton ideasman42 at gmail.com
Sat Feb 25 09:38:04 CET 2012


Revision: 44421
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44421
Author:   campbellbarton
Date:     2012-02-25 08:37:51 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
remove redundant NULL check in draw_new_particle_system()

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-02-25 01:26:45 UTC (rev 44420)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-02-25 08:37:51 UTC (rev 44421)
@@ -4131,8 +4131,9 @@
 {
 	Object *ob=base->object;
 	ParticleEditSettings *pset = PE_settings(scene);
-	ParticleSettings *part;
-	ParticleData *pars, *pa;
+	ParticleSettings *part = psys->part;
+	ParticleData *pars = psys->particles;
+	ParticleData *pa;
 	ParticleKey state, *states=NULL;
 	ParticleBillboardData bb;
 	ParticleSimulationData sim= {NULL};
@@ -4150,12 +4151,6 @@
 	unsigned char tcol[4]= {0, 0, 0, 255};
 
 /* 1. */
-	if (psys==NULL)
-		return;
-
-	part=psys->part;
-	pars=psys->particles;
-
 	if (part==NULL || !psys_check_enabled(ob, psys))
 		return;
 




More information about the Bf-blender-cvs mailing list