[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58468] trunk/blender/source/blender: fix for unintended fall-through in switch statement, also reduce undo_pos increments in text editor.

[Campbell Barton]

Revision: 58468
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58468
Author:   campbellbarton
Date:     2013-07-21 08:34:02 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
fix for unintended fall-through in switch statement, also reduce  undo_pos increments in text editor.

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

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2013-07-21 08:23:35 UTC (rev 58467)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2013-07-21 08:34:02 UTC (rev 58468)
@@ -2016,10 +2016,7 @@
 			buf[i] = 0;
 
 			/* skip over the length that was stored again */
-			text->undo_pos--;
-			text->undo_pos--;
-			text->undo_pos--; 
-			text->undo_pos--;
+			text->undo_pos -= 4;
 
 			/* Get the cursor positions */
 			txt_undo_read_cursors(text->undo_buf, &text->undo_pos, &curln, &curc, &selln, &selc);
@@ -2053,10 +2050,7 @@
 			MEM_freeN(buf);
 			
 			/* skip over the length that was stored again */
-			text->undo_pos--;
-			text->undo_pos--;
-			text->undo_pos--;
-			text->undo_pos--;
+			text->undo_pos -= 4;
 
 			/* get and restore the cursors */
 			txt_undo_read_cursors(text->undo_buf, &text->undo_pos, &curln, &curc, &selln, &selc);
@@ -2207,10 +2201,7 @@
 			text->undo_pos += linep;
 
 			/* skip over the length that was stored again */
-			text->undo_pos++;
-			text->undo_pos++;
-			text->undo_pos++; 
-			text->undo_pos++;
+			text->undo_pos += 4;
 			
 			txt_delete_sel(text);
 
@@ -2236,10 +2227,7 @@
 			MEM_freeN(buf);
 
 			/* skip over the length that was stored again */
-			text->undo_pos++;
-			text->undo_pos++;
-			text->undo_pos++; 
-			text->undo_pos++;
+			text->undo_pos += 4;
 
 			break;
 			

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-07-21 08:23:35 UTC (rev 58467)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-07-21 08:34:02 UTC (rev 58468)
@@ -6867,8 +6867,8 @@
 			    (rv3d->persp == RV3D_CAMOB && v3d->camera == ob)) /* special exception for active camera */
 			{
 				drawcamera(scene, v3d, rv3d, base, dflag, ob_wire_col);
-				break;
 			}
+			break;
 		case OB_SPEAKER:
 			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
 				drawspeaker(scene, v3d, rv3d, ob, dflag);