[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12487] trunk/blender/source/blender: sequencer snap was crashing when no last selected was available ( own mistake)

[Campbell Barton]

Revision: 12487
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12487
Author:   campbellbarton
Date:     2007-11-05 22:06:27 +0100 (Mon, 05 Nov 2007)

Log Message:
-----------
sequencer snap was crashing when no last selected was available (own mistake)
material names spelling was odd - HalveGreen -> HalfGreen

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/src/editseq.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2007-11-05 20:16:23 UTC (rev 12486)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2007-11-05 21:06:27 UTC (rev 12487)
@@ -757,9 +757,9 @@
 /* ****************** */
 
 char colname_array[125][20]= {
-"Black","DarkRed","HalveRed","Red","Red",
+"Black","DarkRed","HalfRed","Red","Red",
 "DarkGreen","DarkOlive","Brown","Chocolate","OrangeRed",
-"HalveGreen","GreenOlive","DryOlive","Goldenrod","DarkOrange",
+"HalfGreen","GreenOlive","DryOlive","Goldenrod","DarkOrange",
 "LightGreen","Chartreuse","YellowGreen","Yellow","Gold",
 "Green","LawnGreen","GreenYellow","LightOlive","Yellow",
 "DarkBlue","DarkPurple","HotPink","VioletPink","RedPink",
@@ -767,7 +767,7 @@
 "SeaGreen","PaleGreen","GreenKhaki","LightBrown","LightSalmon",
 "SpringGreen","PaleGreen","MediumOlive","YellowBrown","LightGold",
 "LightGreen","LightGreen","LightGreen","GreenYellow","PaleYellow",
-"HalveBlue","DarkSky","HalveMagenta","VioletRed","DeepPink",
+"HalfBlue","DarkSky","HalfMagenta","VioletRed","DeepPink",
 "SteelBlue","SkyBlue","Orchid","LightHotPink","HotPink",
 "SeaGreen","SlateGray","MediumGrey","Burlywood","LightPink",
 "SpringGreen","Aquamarine","PaleGreen","Khaki","PaleOrange",

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2007-11-05 20:16:23 UTC (rev 12486)
+++ trunk/blender/source/blender/src/editseq.c	2007-11-05 21:06:27 UTC (rev 12487)
@@ -2956,13 +2956,13 @@
 				}
 				
 				/* check seq's next to the active also - nice for quick snapping */
-				if (snap_dist && seq_tx_check_left(last_seq)) {
+				if (snap_dist && last_seq && seq_tx_check_left(last_seq)) {
 					seq = find_next_prev_sequence(last_seq, 1, 0); /* left */
 					if(seq && !seq_tx_check_right(seq))
 						TESTSNAP(seq_tx_get_final_right(seq));
 				}
 				
-				if (snap_dist && seq_tx_check_right(last_seq)) {
+				if (snap_dist && last_seq && seq_tx_check_right(last_seq)) {
 					seq = find_next_prev_sequence(last_seq, 2, 0); /* right */
 					if(seq && !seq_tx_check_left(seq))
 						TESTSNAP(seq_tx_get_final_left(seq));