[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54197] trunk/blender/source/blender/ editors/sculpt_paint/paint_vertex.c: fix [#33987] X-ray mode on bones nullifies weight paint mode

Campbell Barton ideasman42 at gmail.com
Wed Jan 30 03:27:18 CET 2013


Revision: 54197
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54197
Author:   campbellbarton
Date:     2013-01-30 02:27:13 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
fix [#33987] X-ray mode on bones nullifies weight paint mode

This effected vertex paint mode too.

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-01-29 23:33:58 UTC (rev 54196)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-01-30 02:27:13 UTC (rev 54197)
@@ -1029,6 +1029,7 @@
 		unsigned int index;
 
 		view3d_operator_needs_opengl(C);
+		ED_view3d_init_mats_rv3d(vc.obact, vc.rv3d);
 
 		if (use_vert_sel) {
 			if (ED_mesh_pick_vert(C, vc.obact, event->mval, &index, ED_MESH_PICK_DEFAULT_VERT_SIZE, TRUE)) {
@@ -1118,6 +1119,7 @@
 				               win->eventstate->y - vc.ar->winrct.ymin};
 
 				view3d_operator_needs_opengl(C);
+				ED_view3d_init_mats_rv3d(vc.obact, vc.rv3d);
 
 				if (use_vert_sel) {
 					if (ED_mesh_pick_vert(C, vc.obact, mval, &index, ED_MESH_PICK_DEFAULT_VERT_SIZE, TRUE)) {
@@ -2230,7 +2232,8 @@
 	indexar = wpd->indexar;
 	
 	view3d_operator_needs_opengl(C);
-		
+	ED_view3d_init_mats_rv3d(ob, vc->rv3d);
+
 	/* load projection matrix */
 	mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat);
 
@@ -2863,7 +2866,8 @@
 	RNA_float_get_array(itemptr, "mouse", mval);
 
 	view3d_operator_needs_opengl(C);
-			
+	ED_view3d_init_mats_rv3d(ob, vc->rv3d);
+
 	/* load projection matrix */
 	mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat);
 




More information about the Bf-blender-cvs mailing list