[Bf-blender-cvs] [421280a3f76] master: Cleanup: remove unused member
mano-wii
noreply at git.blender.org
Thu Aug 1 03:46:50 CEST 2019
Commit: 421280a3f7670a0b4aca0d4397823a357708d7fd
Author: mano-wii
Date: Wed Jul 31 22:46:41 2019 -0300
Branches: master
https://developer.blender.org/rB421280a3f7670a0b4aca0d4397823a357708d7fd
Cleanup: remove unused member
===================================================================
M source/blender/draw/DRW_engine.h
M source/blender/draw/engines/select/select_engine.c
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index e31200ae82f..491717d0137 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -177,8 +177,7 @@ struct DrawDataList *DRW_drawdatalist_from_id(struct ID *id);
void DRW_drawdata_free(struct ID *id);
/* select_engine.c */
-void DRW_select_context_create(struct Depsgraph *depsgraph,
- struct Base **bases,
+void DRW_select_context_create(struct Base **bases,
const uint bases_len,
short select_mode);
bool DRW_select_elem_get(const uint sel_id, uint *r_elem, uint *r_base_index, char *r_elem_type);
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c
index 06998813830..b910f59c432 100644
--- a/source/blender/draw/engines/select/select_engine.c
+++ b/source/blender/draw/engines/select/select_engine.c
@@ -55,7 +55,6 @@ static struct {
/** Total number of items `base_array_index_offsets[bases_len - 1].vert`. */
uint last_index_drawn;
- struct Depsgraph *depsgraph;
short select_mode;
} context;
} e_data = {{{NULL}}}; /* Engine data */
@@ -360,12 +359,8 @@ void DRW_framebuffer_select_id_read(const rcti *rect, uint *r_buf)
}
}
-void DRW_select_context_create(Depsgraph *depsgraph,
- Base **UNUSED(bases),
- const uint bases_len,
- short select_mode)
+void DRW_select_context_create(Base **UNUSED(bases), const uint bases_len, short select_mode)
{
- e_data.context.depsgraph = depsgraph;
e_data.context.select_mode = select_mode;
e_data.context.bases_len = bases_len;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index cb03d51e090..dfc089bc6c4 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2563,7 +2563,7 @@ void DRW_draw_select_id(Depsgraph *depsgraph,
Scene *scene = DEG_get_evaluated_scene(depsgraph);
ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
- DRW_select_context_create(depsgraph, bases, bases_len, select_mode);
+ DRW_select_context_create(bases, bases_len, select_mode);
DRW_opengl_context_enable();
More information about the Bf-blender-cvs
mailing list