[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55161] trunk/blender/source/blender/ editors/space_view3d/view3d_ruler.c: fix for error loading ruler info back from greasepencil.

[Campbell Barton]

Revision: 55161
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55161
Author:   campbellbarton
Date:     2013-03-10 12:06:24 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
fix  for error loading ruler info back from greasepencil.

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

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c	2013-03-10 11:51:58 UTC (rev 55160)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c	2013-03-10 12:06:24 UTC (rev 55161)
@@ -368,7 +368,7 @@
 					}
 					else if (gps->totpoints == 2) {
 						RulerItem *ruler_item = ruler_item_add(ruler_info);
-						for (j = 0; j < 3; j++) {
+						for (j = 0; j < 3; j += 2) {
 							copy_v3_v3(ruler_item->co[j], &pt->x);
 							pt++;
 						}
@@ -732,7 +732,8 @@
 	op->customdata = ruler_info;
 
 	ruler_info->ar = ar;
-	ruler_info->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ruler_info_draw_pixel, ruler_info, REGION_DRAW_POST_PIXEL);
+	ruler_info->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ruler_info_draw_pixel,
+	                                                           ruler_info, REGION_DRAW_POST_PIXEL);
 
 	view3d_ruler_header_update(sa);
 
@@ -794,7 +795,6 @@
 
 						negate_v3_v3(ruler_item->co[0], rv3d->ofs);
 						view3d_ruler_item_project(ruler_info, ruler_item->co[0], event->mval);
-						copy_v3_v3(ruler_item->co[2], ruler_item->co[0]);
 
 						/* snap the first point added, not essential but handy */
 						{
@@ -802,6 +802,7 @@
 							view3d_ruler_item_mousemove(C, ruler_info, event->mval, true);
 						}
 
+						copy_v3_v3(ruler_item->co[2], ruler_item->co[0]);
 						ruler_item->co_index = 2;
 
 						do_draw = true;