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:
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_armature.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_armature.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index a2f9ad0d369..473fadab5ed 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -784,28 +784,28 @@ static void drw_shgroup_bone_relationship_lines(ArmatureDrawContext *ctx,
const float start[3],
const float end[3])
{
- drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorWire);
+ drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_wire);
}
static void drw_shgroup_bone_ik_lines(ArmatureDrawContext *ctx,
const float start[3],
const float end[3])
{
- drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorBoneIKLine);
+ drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_bone_ik_line);
}
static void drw_shgroup_bone_ik_no_target_lines(ArmatureDrawContext *ctx,
const float start[3],
const float end[3])
{
- drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorBoneIKLineNoTarget);
+ drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_bone_ik_line_no_target);
}
static void drw_shgroup_bone_ik_spline_lines(ArmatureDrawContext *ctx,
const float start[3],
const float end[3])
{
- drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorBoneIKLineSpline);
+ drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_bone_ik_line_spline);
}
/** \} */
@@ -918,16 +918,16 @@ static bool set_pchan_color(const ArmatureDrawContext *ctx,
}
else {
if ((boneflag & BONE_DRAW_ACTIVE) && (boneflag & BONE_SELECTED)) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePoseActive);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose_active);
}
else if (boneflag & BONE_DRAW_ACTIVE) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePoseActiveUnsel);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose_active_unsel);
}
else if (boneflag & BONE_SELECTED) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePose);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose);
}
else {
- copy_v4_v4(fcolor, G_draw.block.colorWire);
+ copy_v4_v4(fcolor, G_draw.block.color_wire);
}
}
return true;
@@ -940,23 +940,23 @@ static bool set_pchan_color(const ArmatureDrawContext *ctx,
srgb_to_linearrgb_v4(fcolor, fcolor);
}
else {
- copy_v4_v4(fcolor, G_draw.block.colorBoneSolid);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_solid);
}
return true;
}
case PCHAN_COLOR_CONSTS: {
if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) {
if (constflag & PCHAN_HAS_TARGET) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePoseTarget);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose_target);
}
else if (constflag & PCHAN_HAS_IK) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePoseIK);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose_ik);
}
else if (constflag & PCHAN_HAS_SPLINEIK) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePoseSplineIK);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose_spline_ik);
}
else if (constflag & PCHAN_HAS_CONST) {
- copy_v4_v4(fcolor, G_draw.block.colorBonePoseConstraint);
+ copy_v4_v4(fcolor, G_draw.block.color_bone_pose_constraint);
}
else {
return false;
@@ -978,7 +978,7 @@ static bool set_pchan_color(const ArmatureDrawContext *ctx,
static void bone_locked_color_shade(float color[4])
{
- float *locked_color = G_draw.block.colorBoneLocked;
+ float *locked_color = G_draw.block.color_bone_locked;
interp_v3_v3v3(color, color, locked_color, locked_color[3]);
}
@@ -991,7 +991,7 @@ static const float *get_bone_solid_color(const ArmatureDrawContext *ctx,
const short constflag)
{
if (ctx->const_color) {
- return G_draw.block.colorBoneSolid;
+ return G_draw.block.color_bone_solid;
}
if (arm->flag & ARM_POSEMODE) {
@@ -1006,7 +1006,7 @@ static const float *get_bone_solid_color(const ArmatureDrawContext *ctx,
return disp_color;
}
- return G_draw.block.colorBoneSolid;
+ return G_draw.block.color_bone_solid;
}
static const float *get_bone_solid_with_consts_color(const ArmatureDrawContext *ctx,
@@ -1017,7 +1017,7 @@ static const float *get_bone_solid_with_consts_color(const ArmatureDrawContext *
const short constflag)
{
if (ctx->const_color) {
- return G_draw.block.colorBoneSolid;
+ return G_draw.block.color_bone_solid;
}
const float *col = get_bone_solid_color(ctx, eBone, pchan, arm, boneflag, constflag);
@@ -1060,18 +1060,18 @@ static const float *get_bone_wire_color(const ArmatureDrawContext *ctx,
else if (eBone) {
if (boneflag & BONE_SELECTED) {
if (boneflag & BONE_DRAW_ACTIVE) {
- copy_v3_v3(disp_color, G_draw.block.colorBoneActive);
+ copy_v3_v3(disp_color, G_draw.block.color_bone_active);
}
else {
- copy_v3_v3(disp_color, G_draw.block.colorBoneSelect);
+ copy_v3_v3(disp_color, G_draw.block.color_bone_select);
}
}
else {
if (boneflag & BONE_DRAW_ACTIVE) {
- copy_v3_v3(disp_color, G_draw.block.colorBoneActiveUnsel);
+ copy_v3_v3(disp_color, G_draw.block.color_bone_active_unsel);
}
else {
- copy_v3_v3(disp_color, G_draw.block.colorWireEdit);
+ copy_v3_v3(disp_color, G_draw.block.color_wire_edit);
}
}
}
@@ -1084,7 +1084,7 @@ static const float *get_bone_wire_color(const ArmatureDrawContext *ctx,
}
}
else {
- copy_v3_v3(disp_color, G_draw.block.colorVertex);
+ copy_v3_v3(disp_color, G_draw.block.color_vertex);
}
disp_color[3] = get_bone_wire_thickness(ctx, boneflag);
@@ -1111,7 +1111,7 @@ static const float *get_bone_hint_color(const ArmatureDrawContext *ctx,
static float hint_color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
if (ctx->const_color) {
- bone_hint_color_shade(hint_color, G_draw.block.colorBoneSolid);
+ bone_hint_color_shade(hint_color, G_draw.block.color_bone_solid);
}
else {
const float *wire_color = get_bone_wire_color(ctx, eBone, pchan, arm, boneflag, constflag);
@@ -1408,8 +1408,8 @@ static void draw_axes(ArmatureDrawContext *ctx,
{
float final_col[4];
const float *col = (ctx->const_color) ? ctx->const_color :
- (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi :
- G_draw.block.colorText;
+ (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.color_text_hi :
+ G_draw.block.color_text;
copy_v4_v4(final_col, col);
/* Mix with axes color. */
final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65;
@@ -1444,10 +1444,10 @@ static void draw_points(ArmatureDrawContext *ctx,
float col_solid_root[4], col_solid_tail[4], col_wire_root[4], col_wire_tail[4];
float col_hint_root[4], col_hint_tail[4];
- copy_v4_v4(col_solid_root, G_draw.block.colorBoneSolid);
- copy_v4_v4(col_solid_tail, G_draw.block.colorBoneSolid);
- copy_v4_v4(col_wire_root, (ctx->const_color) ? ctx->const_color : G_draw.block.colorVertex);
- copy_v4_v4(col_wire_tail, (ctx->const_color) ? ctx->const_color : G_draw.block.colorVertex);
+ copy_v4_v4(col_solid_root, G_draw.block.color_bone_solid);
+ copy_v4_v4(col_solid_tail, G_draw.block.color_bone_solid);
+ copy_v4_v4(col_wire_root, (ctx->const_color) ? ctx->const_color : G_draw.block.color_vertex);
+ copy_v4_v4(col_wire_tail, (ctx->const_color) ? ctx->const_color : G_draw.block.color_vertex);
const bool is_envelope_draw = (arm->drawtype == ARM_ENVELOPE);
const float envelope_ignore = -1.0f;
@@ -1457,10 +1457,10 @@ static void draw_points(ArmatureDrawContext *ctx,
/* Edit bone points can be selected */
if (eBone) {
if (eBone->flag & BONE_ROOTSEL) {
- copy_v3_v3(col_wire_root, G_draw.block.colorVertexSelect);
+ copy_v3_v3(col_wire_root, G_draw.block.color_vertex_select);
}
if (eBone->flag & BONE_TIPSEL) {
- copy_v3_v3(col_wire_tail, G_draw.block.colorVertexSelect);
+ copy_v3_v3(col_wire_tail, G_draw.block.color_vertex_select);
}
}
else if (arm->flag & ARM_POSEMODE) {
@@ -1648,12 +1648,12 @@ static void draw_bone_line(ArmatureDrawContext *ctx,
else {
if (eBone) {
if (eBone->flag & BONE_TIPSEL) {
- col_tail = G_draw.block.colorVertexSelect;
+ col_tail = G_draw.block.color_vertex_select;
}
if (boneflag & BONE_SELECTED) {
- col_bone = G_draw.block.colorBoneActive;
+ col_bone = G_draw.block.color_bone_active;
}
- col_wire = G_draw.block.colorWire;
+ col_wire = G_draw.block.color_wire;
}
/* Draw root point if we are not connected to our parent. */
@@ -1661,7 +1661,7 @@ static void draw_bone_line(ArmatureDrawContext *ctx,
(pchan->bone->parent && (boneflag & BONE_CONNECTED)))) {
if (eBone) {
- col_head = (eBone->flag & BONE_ROOTSEL) ? G_draw.block.colorVertexSelect : col_bone;
+ col_head = (eBone->flag & BONE_ROOTSEL) ? G_draw.block.color_vertex_select : col_bone;
}
else {
col_head = col_bone;