Commit: 309e9521f8eb018db33a804fe417a0181ef6bc81
Author: Brecht Van Lommel
Date: Fri May 4 11:36:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB309e9521f8eb018db33a804fe417a0181ef6bc81
Groups: remove drawing group objects in a different color.
With the upcoming unification of groups and collections this will make
no sense anymore, as all objects will be in a collection.
===================================================================
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_common.h
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/shaders/common_globals_lib.glsl
M source/blender/draw/modes/shaders/object_outline_detect_frag.glsl
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/source/blender/draw/intern/draw_common.c
b/source/blender/draw/intern/draw_common.c
index f4847844650..125803fe733 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -54,9 +54,6 @@ void DRW_globals_update(void)
UI_GetThemeColor4fv(TH_ACTIVE, ts.colorActive);
UI_GetThemeColor4fv(TH_SELECT, ts.colorSelect);
UI_GetThemeColor4fv(TH_TRANSFORM, ts.colorTransform);
- UI_GetThemeColor4fv(TH_GROUP_ACTIVE, ts.colorGroupActive);
- UI_GetThemeColorShade4fv(TH_GROUP_ACTIVE, -25, ts.colorGroupSelect);
- UI_GetThemeColor4fv(TH_GROUP, ts.colorGroup);
UI_COLOR_RGBA_FROM_U8(0x88, 0xFF, 0xFF, 155, ts.colorLibrarySelect);
UI_COLOR_RGBA_FROM_U8(0x55, 0xCC, 0xCC, 155, ts.colorLibrary);
UI_GetThemeColor4fv(TH_LAMP, ts.colorLamp);
@@ -613,26 +610,16 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer
*view_layer, float **r_color
}
else {
/* Sets the 'theme_id' or fallback to wire */
- if ((ob->flag & OB_FROMGROUP) != 0) {
- if ((ob->base_flag & BASE_SELECTED) != 0) {
- theme_id = TH_GROUP_ACTIVE;
- }
- else {
- theme_id = TH_GROUP;
- }
+ if ((ob->base_flag & BASE_SELECTED) != 0) {
+ theme_id = (active) ? TH_ACTIVE : TH_SELECT;
}
else {
- if ((ob->base_flag & BASE_SELECTED) != 0) {
- theme_id = (active) ? TH_ACTIVE : TH_SELECT;
- }
- else {
- if (ob->type == OB_LAMP) theme_id = TH_LAMP;
- else if (ob->type == OB_SPEAKER) theme_id =
TH_SPEAKER;
- else if (ob->type == OB_CAMERA) theme_id =
TH_CAMERA;
- else if (ob->type == OB_EMPTY) theme_id =
TH_EMPTY;
- else if (ob->type == OB_LIGHTPROBE) theme_id =
TH_EMPTY; /* TODO add lightprobe color */
- /* fallback to TH_WIRE */
- }
+ if (ob->type == OB_LAMP) theme_id = TH_LAMP;
+ else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER;
+ else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA;
+ else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY;
+ else if (ob->type == OB_LIGHTPROBE) theme_id =
TH_EMPTY; /* TODO add lightprobe color */
+ /* fallback to TH_WIRE */
}
}
@@ -641,8 +628,6 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer
*view_layer, float **r_color
case TH_WIRE_EDIT: *r_color = ts.colorWireEdit;
break;
case TH_ACTIVE: *r_color = ts.colorActive; break;
case TH_SELECT: *r_color = ts.colorSelect; break;
- case TH_GROUP: *r_color = ts.colorGroup; break;
- case TH_GROUP_ACTIVE: *r_color = ts.colorGroupActive;
break;
case TH_TRANSFORM: *r_color = ts.colorTransform;
break;
case OB_SPEAKER: *r_color = ts.colorSpeaker; break;
case OB_CAMERA: *r_color = ts.colorCamera; break;
@@ -650,11 +635,6 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer
*view_layer, float **r_color
case OB_LAMP: *r_color = ts.colorLamp; break;
default: *r_color = ts.colorWire; break;
}
-
- /* uses darker active color for non-active + selected */
- if ((theme_id == TH_GROUP_ACTIVE) && !active) {
- *r_color = ts.colorGroupSelect;
- }
}
return theme_id;
@@ -670,8 +650,6 @@ float *DRW_color_background_blend_get(int theme_id)
case TH_WIRE_EDIT: ret = colors[0]; break;
case TH_ACTIVE: ret = colors[1]; break;
case TH_SELECT: ret = colors[2]; break;
- case TH_GROUP: ret = colors[3]; break;
- case TH_GROUP_ACTIVE: ret = colors[4]; break;
case TH_TRANSFORM: ret = colors[5]; break;
case OB_SPEAKER: ret = colors[6]; break;
case OB_CAMERA: ret = colors[7]; break;
diff --git a/source/blender/draw/intern/draw_common.h
b/source/blender/draw/intern/draw_common.h
index 052cbc7bee9..fe781e2cc9a 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -41,9 +41,6 @@ typedef struct GlobalsUboStorage {
float colorActive[4];
float colorSelect[4];
float colorTransform[4];
- float colorGroupActive[4];
- float colorGroupSelect[4];
- float colorGroup[4];
float colorLibrarySelect[4];
float colorLibrary[4];
float colorLamp[4];
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index 4830aa3334e..5449a6c13bc 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -166,7 +166,6 @@ typedef struct OBJECT_PrivateData {
/* Lamps */
DRWShadingGroup *lamp_center;
- DRWShadingGroup *lamp_center_group;
DRWShadingGroup *lamp_groundpoint;
DRWShadingGroup *lamp_groundline;
DRWShadingGroup *lamp_circle;
@@ -204,50 +203,36 @@ typedef struct OBJECT_PrivateData {
/* Outlines */
DRWShadingGroup *outlines_active;
- DRWShadingGroup *outlines_active_group;
DRWShadingGroup *outlines_select;
- DRWShadingGroup *outlines_select_group;
DRWShadingGroup *outlines_transform;
/* Lightprobes */
DRWShadingGroup *lightprobes_cube_select;
- DRWShadingGroup *lightprobes_cube_select_group;
DRWShadingGroup *lightprobes_cube_active;
- DRWShadingGroup *lightprobes_cube_active_group;
DRWShadingGroup *lightprobes_cube_transform;
DRWShadingGroup *lightprobes_planar_select;
- DRWShadingGroup *lightprobes_planar_select_group;
DRWShadingGroup *lightprobes_planar_active;
- DRWShadingGroup *lightprobes_planar_active_group;
DRWShadingGroup *lightprobes_planar_transform;
/* Wire */
DRWShadingGroup *wire;
DRWShadingGroup *wire_active;
- DRWShadingGroup *wire_active_group;
DRWShadingGroup *wire_select;
- DRWShadingGroup *wire_select_group;
DRWShadingGroup *wire_transform;
/* Points */
DRWShadingGroup *points;
DRWShadingGroup *points_active;
- DRWShadingGroup *points_active_group;
DRWShadingGroup *points_select;
- DRWShadingGroup *points_select_group;
DRWShadingGroup *points_transform;
/* Outlines id offset */
int id_ofs_active;
- int id_ofs_active_group;
int id_ofs_select;
- int id_ofs_select_group;
int id_ofs_transform;
int id_ofs_prb_active;
- int id_ofs_prb_active_group;
int id_ofs_prb_select;
- int id_ofs_prb_select_group;
int id_ofs_prb_transform;
} OBJECT_PrivateData; /* Transient data */
@@ -632,10 +617,6 @@ static int *shgroup_theme_id_to_probe_outline_counter(
return &stl->g_data->id_ofs_prb_active;
case TH_SELECT:
return &stl->g_data->id_ofs_prb_select;
- case TH_GROUP:
- return &stl->g_data->id_ofs_prb_select_group;
- case TH_GROUP_ACTIVE:
- return &stl->g_data->id_ofs_prb_active_group;
case TH_TRANSFORM:
default:
return &stl->g_data->id_ofs_prb_transform;
@@ -650,10 +631,6 @@ static int *shgroup_theme_id_to_outline_counter(
return &stl->g_data->id_ofs_active;
case TH_SELECT:
return &stl->g_data->id_ofs_select;
- case TH_GROUP:
- return &stl->g_data->id_ofs_select_group;
- case TH_GROUP_ACTIVE:
- return &stl->g_data->id_ofs_active_group;
case TH_TRANSFORM:
default:
return &stl->g_data->id_ofs_transform;
@@ -669,10 +646,6 @@ static DRWShadingGroup
*shgroup_theme_id_to_probe_planar_outline_shgrp(
return stl->g_data->lightprobes_planar_active;
case TH_SELECT:
return stl->g_data->lightprobes_planar_select;
- case TH_GROUP:
- return stl->g_data->lightprobes_planar_select_group;
- case TH_GROUP_ACTIVE:
- return stl->g_data->lightprobes_planar_active_group;
case TH_TRANSFORM:
default:
return stl->g_data->lightprobes_planar_transform;
@@ -688,10 +661,6 @@ static DRWShadingGroup
*shgroup_theme_id_to_probe_cube_outline_shgrp(
return stl->g_data->lightprobes_cube_active;
case TH_SELECT:
return stl->g_data->lightprobes_cube_select;
- case TH_GROUP:
- return stl->g_data->lightprobes_cube_select_group;
- case TH_GROUP_ACTIVE:
- return stl->g_data->lightprobes_cube_active_group;
case TH_TRANSFORM:
default:
return stl->g_data->lightprobes_cube_transform;
@@ -709,10 +678,6 @@ static DRWShadingGroup *shgroup_theme_id_to_outline_or(
return stl->g_data->outlines_active;
case TH_SELECT:
return stl->g_data->outlines_select;
- case TH_GROUP:
- return stl->g_data->outlines_select_group;
- case TH_GROUP_ACTIVE:
- return stl->g_data->outlines_active_group;
case TH_TRANSFORM:
return stl->g_data->outlines_transform;
default:
@@ -728,10 +693,6 @@ static DRWShadingGroup *shgroup_theme_id_to_wire_or(
return stl->g_data->wire_active;
case TH_SELECT:
return stl->g_data->wire_select;
- case TH_GROUP:
- return stl->g_data->wire_select_group;
- case TH_GROUP_ACTIVE:
- return stl->g_data->wire_active_group;
case TH_TRANSFORM:
return stl->g_data->wire_transform;
default:
@@ -747,10 +708,6 @@ static DRWShadingGroup *shgroup_theme_id_to_point_or(
return stl->g_data->points_active;
case TH_SELECT:
return stl->g_data->points_select;
- case TH_GROUP:
- return stl->g_data->points_select_group;
- case TH_GROUP_ACTIVE:
- return stl->g_data->points_active_group;
case TH_TRANSFORM:
return stl->g_data->points_transform;
default:
@@ -905,19 +862,15 @@ static void OBJECT_cache_init(void *vedata)
/* Select */
g_data->outlines_select = shgroup_outline(psl->outlines,
&g_data->id_ofs_select, sh);
- g_data->outlines_select_group = shgroup_outline(psl->outlines,
&g_data->id_ofs_select_group, sh);
/* Transform */
g_data->outlines_transform = shgroup_outline(psl->outlines,
&g_data->id_ofs_transform, sh);
/* Active */
g_data->outlines_active = shgroup_outline(psl->outlines,
&g_data->id_ofs_active, sh);
- g_data->outlines_active_group = shgroup_outline(psl->outlines,
&g_data->id_ofs_active_group, sh);
g_data->id_ofs_select = 0;
- g_data->id_ofs_select_group = 0;
g_data->id_ofs_active = 0;
- g_data->id_ofs_active_group = 0;
g_data->id_ofs_transform = 0;
}
@@ -929,22 +882,16 @@ static void OBJECT_cache_init(void *vedata)
/* Cubemap */
g_data->lightprobes_cube_select =
shgroup_instance_outline(pass, sphere, &g_data->id_ofs_prb_select);
- g_data->lightprobes_cube_select_group =
shgroup_instance_outline(pass, sphere, &g_data->id_ofs_prb_select_group);
g_data->lightprobes_cube_active =
shgroup_instance_outline(pass, sphere, &g_data->id_ofs_prb_active);
- g_data->lightprobes_cube_active_group =
shgroup_instance_outline(pass, sphere, &g_data->id_ofs_prb_active_group);
g_data->lightpr
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
