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
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc4
-rw-r--r--source/blender/depsgraph/intern/depsgraph_query_iter.cc2
-rw-r--r--source/blender/draw/intern/draw_armature.c4
-rw-r--r--source/blender/draw/intern/draw_manager.c2
-rw-r--r--source/blender/draw/modes/edit_metaball_mode.c8
-rw-r--r--source/blender/draw/modes/object_mode.c2
-rw-r--r--source/blender/editors/armature/armature_select.c6
-rw-r--r--source/blender/editors/metaball/mball_edit.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c24
-rw-r--r--source/blender/makesdna/DNA_object_types.h2
10 files changed, 30 insertions, 26 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 2b5b749bebc..6c56eeb31a9 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -92,7 +92,7 @@ void DepsgraphNodeBuilder::build_view_layer(
/* Get pointer to a CoW version of scene ID. */
Scene *scene_cow = get_cow_datablock(scene);
/* Scene objects. */
- int select_color = 1;
+ int select_id = 1;
/* NOTE: Base is used for function bindings as-is, so need to pass CoW base,
* but object is expected to be an original one. Hence we go into some
* tricks here iterating over the view layer. */
@@ -109,7 +109,7 @@ void DepsgraphNodeBuilder::build_view_layer(
is_object_visible);
++base_index;
}
- base->object->select_color = select_color++;
+ base->object->select_id = select_id++;
}
build_layer_collections(&view_layer->layer_collections);
if (scene->camera != NULL) {
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 99d40305ff3..4aaeaf48040 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -145,7 +145,7 @@ bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
Object *dupli_parent = data->dupli_parent;
Object *temp_dupli_object = &data->temp_dupli_object;
*temp_dupli_object = *dob->ob;
- temp_dupli_object->select_color = dupli_parent->select_color;
+ temp_dupli_object->select_id = dupli_parent->select_id;
temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROM_DUPLI;
temp_dupli_object->base_local_view_bits = dupli_parent->base_local_view_bits;
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 26d53df2626..f22350113e7 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1695,7 +1695,7 @@ static void draw_armature_edit(Object *ob)
const bool show_text = DRW_state_show_text();
const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0);
- for (eBone = arm->edbo->first, index = ob->select_color; eBone; eBone = eBone->next, index += 0x10000) {
+ for (eBone = arm->edbo->first, index = ob->select_id; eBone; eBone = eBone->next, index += 0x10000) {
if (eBone->layer & arm->layer) {
if ((eBone->flag & BONE_HIDDEN_A) == 0) {
const int select_id = is_select ? index : (uint)-1;
@@ -1783,7 +1783,7 @@ static void draw_armature_pose(Object *ob, const float const_color[4])
}
if (arm->flag & ARM_POSEMODE) {
- index = ob->select_color;
+ index = ob->select_id;
}
}
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 77e96c99aee..e8a7d362d16 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2159,7 +2159,7 @@ void DRW_draw_select_loop(
/* This relies on dupli instances being after their instancing object. */
if ((ob->base_flag & BASE_FROM_DUPLI) == 0) {
Object *ob_orig = DEG_get_original_object(ob);
- DRW_select_load_id(ob_orig->select_color);
+ DRW_select_load_id(ob_orig->select_id);
}
DST.dupli_parent = data_.dupli_parent;
DST.dupli_source = data_.dupli_object_current;
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index cfeeb973ddf..72d8b4b86f8 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -162,8 +162,8 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob)
copy_v3_v3(draw_scale_xform[2], scamat[2]);
}
- int selection_id = ob->select_color;
- for (MetaElem *ml = mb->editelems->first; ml != NULL; ml = ml->next, selection_id += 0x10000) {
+ int select_id = ob->select_id;
+ for (MetaElem *ml = mb->editelems->first; ml != NULL; ml = ml->next, select_id += 0x10000) {
float world_pos[3];
mul_v3_m4v3(world_pos, ob->obmat, &ml->x);
draw_scale_xform[0][3] = world_pos[0];
@@ -176,7 +176,7 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob)
else color = col_radius;
if (is_select) {
- DRW_select_load_id(selection_id | MBALLSEL_RADIUS);
+ DRW_select_load_id(select_id | MBALLSEL_RADIUS);
}
DRW_shgroup_call_dynamic_add(group, draw_scale_xform, &ml->rad, color);
@@ -185,7 +185,7 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob)
else color = col_stiffness;
if (is_select) {
- DRW_select_load_id(selection_id | MBALLSEL_STIFF);
+ DRW_select_load_id(select_id | MBALLSEL_STIFF);
}
DRW_shgroup_call_dynamic_add(group, draw_scale_xform, &draw_stiffness_radius, color);
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index dae1a5a6e30..22409746c13 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2016,7 +2016,7 @@ static void DRW_shgroup_camera(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLay
}
if (is_select) {
- DRW_select_load_id(camera_object->select_color | (track_index << 16));
+ DRW_select_load_id(camera_object->select_id | (track_index << 16));
track_index++;
}
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 4e49d4b2877..8d58ee28f5c 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -68,7 +68,7 @@ Base *ED_armature_base_and_ebone_from_select_buffer(
EditBone *ebone = NULL;
/* TODO(campbell): optimize, eg: sort & binary search. */
for (uint base_index = 0; base_index < bases_len; base_index++) {
- if (bases[base_index]->object->select_color == hit_object) {
+ if (bases[base_index]->object->select_id == hit_object) {
base = bases[base_index];
break;
}
@@ -90,7 +90,7 @@ Object *ED_armature_object_and_ebone_from_select_buffer(
EditBone *ebone = NULL;
/* TODO(campbell): optimize, eg: sort & binary search. */
for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
- if (objects[ob_index]->select_color == hit_object) {
+ if (objects[ob_index]->select_id == hit_object) {
ob = objects[ob_index];
break;
}
@@ -112,7 +112,7 @@ Base *ED_armature_base_and_bone_from_select_buffer(
Bone *bone = NULL;
/* TODO(campbell): optimize, eg: sort & binary search. */
for (uint base_index = 0; base_index < bases_len; base_index++) {
- if (bases[base_index]->object->select_color == hit_object) {
+ if (bases[base_index]->object->select_id == hit_object) {
base = bases[base_index];
break;
}
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index f0df8121a02..2af78261b87 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -712,7 +712,7 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool dese
}
const uint hit_object = hitresult & 0xFFFF;
- if (vc.obedit->select_color != hit_object) {
+ if (vc.obedit->select_id != hit_object) {
continue;
}
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index c10953384e8..38436591a67 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1208,7 +1208,7 @@ static Base *object_mouse_select_menu(
bool ok;
LinkNode *linklist = NULL;
- /* handle base->object->select_color */
+ /* handle base->object->select_id */
CTX_DATA_BEGIN (C, Base *, base, selectable_bases)
{
ok = false;
@@ -1217,7 +1217,7 @@ static Base *object_mouse_select_menu(
if (buffer) {
for (int a = 0; a < hits; a++) {
/* index was converted */
- if (base->object->select_color == (buffer[(4 * a) + 3] & ~0xFFFF0000)) {
+ if (base->object->select_id == (buffer[(4 * a) + 3] & ~0xFFFF0000)) {
ok = true;
break;
}
@@ -1458,7 +1458,7 @@ static Base *mouse_select_eval_buffer(
else {
/* only exclude active object when it is selected... */
if (BASACT(view_layer) && (BASACT(view_layer)->flag & BASE_SELECTED) && hits > 1) {
- notcol = BASACT(view_layer)->object->select_color;
+ notcol = BASACT(view_layer)->object->select_id;
}
for (a = 0; a < hits; a++) {
@@ -1472,7 +1472,9 @@ static Base *mouse_select_eval_buffer(
base = FIRSTBASE(view_layer);
while (base) {
if (BASE_SELECTABLE(v3d, base)) {
- if (base->object->select_color == selcol) break;
+ if (base->object->select_id == selcol) {
+ break;
+ }
}
base = base->next;
}
@@ -1495,13 +1497,15 @@ static Base *mouse_select_eval_buffer(
if (has_bones) {
/* skip non-bone objects */
if ((buffer[4 * a + 3] & 0xFFFF0000)) {
- if (base->object->select_color == (buffer[(4 * a) + 3] & 0xFFFF))
+ if (base->object->select_id == (buffer[(4 * a) + 3] & 0xFFFF)) {
basact = base;
+ }
}
}
else {
- if (base->object->select_color == (buffer[(4 * a) + 3] & 0xFFFF))
+ if (base->object->select_id == (buffer[(4 * a) + 3] & 0xFFFF)) {
basact = base;
+ }
}
}
}
@@ -1703,7 +1707,7 @@ static bool ed_object_select_pick(
/* if there's bundles in buffer select bundles first,
* so non-camera elements should be ignored in buffer */
- if (basact->object->select_color != (hitresult & 0xFFFF)) {
+ if (basact->object->select_id != (hitresult & 0xFFFF)) {
continue;
}
@@ -2385,7 +2389,7 @@ static int do_meta_box_select(
}
const uint hit_object = hitresult & 0xFFFF;
- if (vc->obedit->select_color != hit_object) {
+ if (vc->obedit->select_id != hit_object) {
continue;
}
@@ -2537,7 +2541,7 @@ static int do_object_box_select(bContext *C, ViewContext *vc, rcti *rect, const
for (Base *base = vc->view_layer->object_bases.first; base; base = base->next) {
if (BASE_SELECTABLE(v3d, base)) {
- if ((base->object->select_color & 0x0000FFFF) != 0) {
+ if ((base->object->select_id & 0x0000FFFF) != 0) {
BLI_array_append(bases, base);
}
}
@@ -2627,7 +2631,7 @@ static int do_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, const eS
/* Select the next bone if we're not switching bases. */
if (col + 4 != col_end) {
- if ((base->object->select_color & 0x0000FFFF) != (col[4] & 0x0000FFFF)) {
+ if ((base->object->select_id & 0x0000FFFF) != (col[4] & 0x0000FFFF)) {
break;
}
if (base->object->pose != NULL) {
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index cf88d2591b2..5b38875caa6 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -376,7 +376,7 @@ typedef struct Object {
char empty_image_depth;
char _pad8[2];
- int select_color;
+ int select_id;
/** Contains data for levels of detail. */
ListBase lodlevels;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 03:32:05 +0300