[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53484] trunk/blender/source/blender/ editors: fix for own error in recent weight paint code, bound-box clip wasnt working.

[Campbell Barton]

Revision: 53484
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53484
Author:   campbellbarton
Date:     2013-01-01 14:20:59 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
fix for own error in recent weight paint code, bound-box clip wasnt working.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    trunk/blender/source/blender/editors/space_view3d/view3d_project.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-01-01 14:06:02 UTC (rev 53483)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-01-01 14:20:59 UTC (rev 53484)
@@ -859,7 +859,7 @@
 {
 	float vertco[2];
 
-	if (ED_view3d_project_float_global(vc->ar,
+	if (ED_view3d_project_float_object(vc->ar,
 	                                   co, vertco,
 	                                   V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
 	{
@@ -2218,7 +2218,7 @@
 		ED_region_tag_redraw(CTX_wm_region(C));
 		return;
 	}
-		
+
 	vc = &wpd->vc;
 	ob = vc->obact;
 	me = ob->data;
@@ -3061,9 +3061,9 @@
 		 * the screen coords of the verts need to be cached because
 		 * updating the mesh may move them about (entering feedback loop) */
 		if (grad_data->is_init) {
-			if (ED_view3d_project_float_global(grad_data->ar,
+			if (ED_view3d_project_float_object(grad_data->ar,
 			                                   co, vs->sco,
-			                                   V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
+			                                   V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK)
 			{
 				/* ok */
 				MDeformVert *dv = &me->dvert[index];

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_project.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_project.c	2013-01-01 14:06:02 UTC (rev 53483)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_project.c	2013-01-01 14:20:59 UTC (rev 53484)
@@ -110,7 +110,7 @@
 
 /* perspmat is typically...
  * - 'rv3d->perspmat',   is_local == FALSE
- * - 'rv3d->perspmatob', is_local == TRUE
+ * - 'rv3d->persmatob', is_local == TRUE
  */
 static eV3DProjStatus ed_view3d_project__internal(ARegion *ar,
                                                   float perspmat[4][4], const int is_local,  /* normally hidden */