[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33211] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fixed missed selection oulines for curves/surfaces/fonts/ armature when texture shading is active
Sergey Sharybin
g.ulairi at gmail.com
Sun Nov 21 15:05:18 CET 2010
Revision: 33211
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33211
Author: nazgul
Date: 2010-11-21 15:05:18 +0100 (Sun, 21 Nov 2010)
Log Message:
-----------
Fixed missed selection oulines for curves/surfaces/fonts/armature when texture shading is active
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-11-21 13:41:43 UTC (rev 33210)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-11-21 14:05:18 UTC (rev 33211)
@@ -5413,7 +5413,7 @@
}
/* draws wire outline */
-static void drawSolidSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
+static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
{
RegionView3D *rv3d= ar->regiondata;
Object *ob= base->object;
@@ -5811,12 +5811,12 @@
if (cu->disp.first==NULL) makeDispListCurveTypes(scene, ob, 0);
}
- /* draw outline for selected solid objects, mesh does itself */
+ /* draw outline for selected objects, mesh does itself */
if((v3d->flag & V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && ob->type!=OB_MESH) {
- if(dt>OB_WIRE && dt<OB_TEXTURE && (ob->mode & OB_MODE_EDIT)==0 && (flag & DRAW_SCENESET)==0) {
+ if(dt>OB_WIRE && (ob->mode & OB_MODE_EDIT)==0 && (flag & DRAW_SCENESET)==0) {
if (!(ob->dtx&OB_DRAWWIRE) && (ob->flag&SELECT) && !(flag&DRAW_PICKING)) {
- drawSolidSelect(scene, v3d, ar, base);
+ drawObjectSelect(scene, v3d, ar, base);
}
}
}
More information about the Bf-blender-cvs
mailing list