diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-11-06 00:06:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-11-06 00:06:27 +0300 |
| commit | f1c6a69aad1f94f406cfa5172b7ddb941e80649d (patch) | |
| tree | e8e519ecfa8bb2ceccb5772d17dee5c232ca4579 /source/blender | |
| parent | 8d10ab61c612f16f96d551d46811244ae72a1ae4 (diff) | |
sequencer snap was crashing when no last selected was available (own mistake)
material names spelling was odd - HalveGreen -> HalfGreen
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 6 | ||||
| -rw-r--r-- | source/blender/src/editseq.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index d70cd683237..49d3021090e 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -757,9 +757,9 @@ int material_in_material(Material *parmat, Material *mat) /* ****************** */ 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 @@ char colname_array[125][20]= { "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", diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index fafb5081ef0..eed3145284c 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -2956,13 +2956,13 @@ void transform_seq(int mode, int context) } /* 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)); |