[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19977] trunk/blender/source/blender/src/ drawgpencil.c: Bugfix #18649

Ton Roosendaal ton at blender.org
Wed Apr 29 18:16:08 CEST 2009


Revision: 19977
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19977
Author:   ton
Date:     2009-04-29 18:16:08 +0200 (Wed, 29 Apr 2009)

Log Message:
-----------
Bugfix #18649

Grease pencil, floating panel, "Delete last stroke" crashed when there 
were no strokes. Simple NULL check added.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawgpencil.c

Modified: trunk/blender/source/blender/src/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/src/drawgpencil.c	2009-04-29 16:07:10 UTC (rev 19976)
+++ trunk/blender/source/blender/src/drawgpencil.c	2009-04-29 16:16:08 UTC (rev 19977)
@@ -139,12 +139,14 @@
 {
 	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
 	
-	if (gpf->framenum != CFRA) return;
+	if (gpf) {
+		if (gpf->framenum != CFRA) return;
 
-	gpencil_layer_setactive(gpd, gpl);
-	gpencil_frame_delete_laststroke(gpl, gpf);
-	
-	scrarea_queue_winredraw(curarea);
+		gpencil_layer_setactive(gpd, gpl);
+		gpencil_frame_delete_laststroke(gpl, gpf);
+		
+		scrarea_queue_winredraw(curarea);
+	}
 }
 
 /* delete active frame of active layer */





More information about the Bf-blender-cvs mailing list