Skip to content
Snippets Groups Projects
Commit 74cbedc5 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

Small fix to respect the parser volume color settings
parent b1488374
No related branches found
No related tags found
No related merge requests found
// $Id: Mesh.cpp,v 1.66 2004-02-28 00:48:49 geuzaine Exp $ // $Id: Mesh.cpp,v 1.67 2004-03-04 23:08:31 geuzaine Exp $
// //
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
// //
...@@ -315,9 +315,12 @@ void Draw_Simplex_Volume(void *a, void *b) ...@@ -315,9 +315,12 @@ void Draw_Simplex_Volume(void *a, void *b)
// FIXME: move this in Draw_Mesh_Volumes as soon as a coherent // FIXME: move this in Draw_Mesh_Volumes as soon as a coherent
// structure exists for volumes // structure exists for volumes
Volume *V; Volume *v = FindVolume(s->iEnt, THEM);
if((V = FindVolume(s->iEnt, THEM)) && !(V->Visible & VIS_MESH)) if(v){
if(!(v->Visible & VIS_MESH))
return; return;
theColor = v->Color;
}
if(CTX.mesh.color_carousel == 2) if(CTX.mesh.color_carousel == 2)
thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, s->iEnt); thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, s->iEnt);
...@@ -869,9 +872,12 @@ void Draw_Hexahedron_Volume(void *a, void *b) ...@@ -869,9 +872,12 @@ void Draw_Hexahedron_Volume(void *a, void *b)
// FIXME: move this in Draw_Mesh_Volumes as soon as a coherent // FIXME: move this in Draw_Mesh_Volumes as soon as a coherent
// structure exists for volumes // structure exists for volumes
Volume *V; Volume *v = FindVolume(h->iEnt, THEM);
if((V = FindVolume(h->iEnt, THEM)) && !(V->Visible & VIS_MESH)) if(v){
if(!(v->Visible & VIS_MESH))
return; return;
theColor = v->Color;
}
if(CTX.mesh.color_carousel == 2) if(CTX.mesh.color_carousel == 2)
thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, h->iEnt); thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, h->iEnt);
...@@ -1016,9 +1022,12 @@ void Draw_Prism_Volume(void *a, void *b) ...@@ -1016,9 +1022,12 @@ void Draw_Prism_Volume(void *a, void *b)
// FIXME: move this in Draw_Mesh_Volumes as soon as a coherent // FIXME: move this in Draw_Mesh_Volumes as soon as a coherent
// structure exists for volumes // structure exists for volumes
Volume *V; Volume *v = FindVolume(p->iEnt, THEM);
if((V = FindVolume(p->iEnt, THEM)) && !(V->Visible & VIS_MESH)) if(v){
if(!(v->Visible & VIS_MESH))
return; return;
theColor = v->Color;
}
if(CTX.mesh.color_carousel == 2) if(CTX.mesh.color_carousel == 2)
thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, p->iEnt); thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, p->iEnt);
...@@ -1144,9 +1153,12 @@ void Draw_Pyramid_Volume(void *a, void *b) ...@@ -1144,9 +1153,12 @@ void Draw_Pyramid_Volume(void *a, void *b)
// FIXME: move this in Draw_Mesh_Volumes as soon as a coherent // FIXME: move this in Draw_Mesh_Volumes as soon as a coherent
// structure exists for volumes // structure exists for volumes
Volume *V; Volume *v = FindVolume(p->iEnt, THEM);
if((V = FindVolume(p->iEnt, THEM)) && !(V->Visible & VIS_MESH)) if(v){
if(!(v->Visible & VIS_MESH))
return; return;
theColor = v->Color;
}
if(CTX.mesh.color_carousel == 2) if(CTX.mesh.color_carousel == 2)
thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, p->iEnt); thePhysical = getFirstPhysical(MSH_PHYSICAL_VOLUME, p->iEnt);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment