Revision: 44774
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44774
Author: campbellbarton
Date: 2012-03-09 22:00:40 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
disable object outline draw when painting (its distracting), also fix for own
recent mistake in vgroup_blend(). - had bad check for editmesh.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2012-03-09
21:23:15 UTC (rev 44773)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2012-03-09
22:00:40 UTC (rev 44774)
@@ -1254,7 +1254,7 @@
BMEditMesh *em;
- if (ob->type == OB_MESH && ((em = BMEdit_FromObject(ob)) != NULL)) {
+ if (ob->type != OB_MESH || ((em = BMEdit_FromObject(ob)) == NULL)) {
return;
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-03-09 21:23:15 UTC (rev 44773)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-03-09 22:00:40 UTC (rev 44774)
@@ -3187,7 +3187,9 @@
static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
{
- if (v3d->transp==0) { // not when we draw the transparent pass
+ if ((v3d->transp == FALSE) && /* not when we draw the transparent pass
*/
+ (ob->mode & OB_MODE_ALL_PAINT) == FALSE) /* not when painting (its
distracting) - campbell */
+ {
glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f);
glDepthMask(0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
