Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: minor changes to logic for outline drawing

Browse Source 
Use brace placement following code-style too.
This commit is contained in:
Campbell Barton
2017-04-13 21:44:24 +10:00
parent 102c331146
commit b96777b3e1
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/blender/draw/modes/object_mode.c
View File

@@ -1088,30 +1088,34 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
switch (ob->type) { switch (ob->type) {
case OB_MESH: case OB_MESH:
{ {
Object *obedit = scene->obedit; Object *obedit = scene->obedit;
int theme_id = DRW_object_wire_theme_get(ob, sl, NULL); if (ob != obedit) {
if (ob != obedit) { if (do_outlines) {
if (do_outlines) { struct Batch *geom = DRW_cache_mesh_surface_get(ob);
struct Batch *geom = DRW_cache_mesh_surface_get(ob); int theme_id = DRW_object_wire_theme_get(ob, sl, NULL);
switch (theme_id) { DRWShadingGroup *shgroup = NULL;
case TH_ACTIVE: switch (theme_id) {
DRW_shgroup_call_add(stl->g_data->outlines_active, geom, ob->obmat); case TH_ACTIVE:
break; shgroup = stl->g_data->outlines_active;
case TH_SELECT: break;
DRW_shgroup_call_add(stl->g_data->outlines_select, geom, ob->obmat); case TH_SELECT:
break; shgroup = stl->g_data->outlines_select;
case TH_GROUP_ACTIVE: break;
DRW_shgroup_call_add(stl->g_data->outlines_select_group, geom, ob->obmat); case TH_GROUP_ACTIVE:
break; shgroup = stl->g_data->outlines_select_group;
case TH_TRANSFORM: break;
DRW_shgroup_call_add(stl->g_data->outlines_transform, geom, ob->obmat); case TH_TRANSFORM:
break; shgroup = stl->g_data->outlines_transform;
} break;
}
if (shgroup != NULL) {
DRW_shgroup_call_add(shgroup, geom, ob->obmat);
} }
} }
} }
break; break;
}
case OB_LAMP: case OB_LAMP:
DRW_shgroup_lamp(stl, ob, sl); DRW_shgroup_lamp(stl, ob, sl);
break; break;
@@ -1125,15 +1129,17 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_shgroup_speaker(stl, ob, sl); DRW_shgroup_speaker(stl, ob, sl);
break; break;
case OB_ARMATURE: case OB_ARMATURE:
{ {
bArmature *arm = ob->data; bArmature *arm = ob->data;
if (arm->edbo == NULL) { if (arm->edbo == NULL) {
DRW_shgroup_armature_object(ob, sl, ((OBJECT_Data *)vedata)->psl->bone_solid, DRW_shgroup_armature_object(
((OBJECT_Data *)vedata)->psl->bone_wire, ob, sl,
stl->g_data->relationship_lines); ((OBJECT_Data *)vedata)->psl->bone_solid,
} ((OBJECT_Data *)vedata)->psl->bone_wire,
stl->g_data->relationship_lines);
} }
break; break;
}
default: default:
break; break;
} }