Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2010-04-04 15:07:42 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2010-04-04 15:07:42 +0400
commit426aaaa0a29ea2ddaf008142752fc1efb91033f0 (patch)
treecb58c1e596d2ebf1f0db8f238e5d54ba7e9bf7c3 /source/blender/editors/space_view3d/drawobject.c
parent694934a2f7225aba6c2d20f2563d7cbc25cbfa15 (diff)
Use DerivedMesh->getNumFaces function in drawSolidSelect() if curve
object has got derived mesh.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
-rw-r--r--source/blender/editors/space_view3d/drawobject.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index d16da662136..c5cbb080b4c 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5329,8 +5329,15 @@ static void drawSolidSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
if(ELEM3(ob->type, OB_FONT,OB_CURVE, OB_SURF)) {
Curve *cu = ob->data;
DerivedMesh *dm = ob->derivedFinal;
+ int hasfaces= 0;
- if (displist_has_faces(&cu->disp) && boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
+ if (dm) {
+ hasfaces= dm->getNumFaces(dm);
+ } else {
+ hasfaces= displist_has_faces(&cu->disp);
+ }
+
+ if (hasfaces && boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
draw_index_wire= 0;
if (dm) {
draw_mesh_object_outline(v3d, ob, dm);