diff options
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_extra.c')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_extra.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index 4f0bf0b8048..73450db8eea 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -194,23 +194,23 @@ void OVERLAY_extra_cache_init(OVERLAY_Data *vedata) DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorActive); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_active); cb->center_active = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorSelect); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_select); cb->center_selected = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorDeselect); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_deselect); cb->center_deselected = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorLibrarySelect); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_library_select); cb->center_selected_lib = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorLibrary); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_library); cb->center_deselected_lib = BUF_POINT(grp_sub, format); } } @@ -861,8 +861,8 @@ static void camera_view3d_reconstruction( int track_index = 1; float bundle_color_custom[3]; - float *bundle_color_solid = G_draw.block.colorBundleSolid; - float *bundle_color_unselected = G_draw.block.colorWire; + float *bundle_color_solid = G_draw.block.color_bundle_solid; + float *bundle_color_unselected = G_draw.block.color_wire; uchar text_color_selected[4], text_color_unselected[4]; /* Color Management: Exception here as texts are drawn in sRGB space directly. */ UI_GetThemeColor4ubv(TH_SELECT, text_color_selected); @@ -1034,7 +1034,7 @@ static void camera_stereoscopy_extra(OVERLAY_ExtraCallBuffers *cb, DRW_buffer_add_entry_struct(cb->camera_frame, &stereodata); /* Connecting line between cameras. */ - OVERLAY_extra_line_dashed(cb, stereodata.pos, instdata->pos, G_draw.block.colorWire); + OVERLAY_extra_line_dashed(cb, stereodata.pos, instdata->pos, G_draw.block.color_wire); } if (is_stereo3d_volume && !is_select) { @@ -1248,8 +1248,8 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb, Scene *scene, Object *ob) { - float *relation_color = G_draw.block.colorWire; - float *constraint_color = G_draw.block.colorGridAxisZ; /* ? */ + float *relation_color = G_draw.block.color_wire; + float *constraint_color = G_draw.block.color_grid_axis_z; /* ? */ if (ob->parent && (DRW_object_visibility_in_active_context(ob->parent) & OB_VISIBLE_SELF)) { float *parent_pos = ob->runtime.parent_display_origin; |