blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: Remove the "SpaceTime->caches" and "SpaceTimeCache" stuff 

These were runtime only data, used in pre 2.8 Blender to make use of GL vertex arrays
to draw these more efficiently. Maybe we might restore these sometime as an optimisation
step, but for now, they're not needing and were confusing.
This commit is contained in:
Joshua Leung 2018-04-19 16:28:27 +02:00
parent b2eb76cd50
commit 59a1ebabcd
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/readfile.c
View File

@ -6540,10 +6540,6 @@ static void direct_link_area(FileData *fd, ScrArea *area)
st->scroll_accum[0] = 0.0f;
st->scroll_accum[1] = 0.0f;
}
else if (sl->spacetype == SPACE_TIME) {
SpaceTime *stime = (SpaceTime *)sl;
BLI_listbase_clear(&stime->caches);
}
else if (sl->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = (SpaceSeq *)sl;

3
source/blender/editors/space_action/action_draw.c
View File

@ -406,8 +406,7 @@ void timeline_draw_cache(SpaceAction *saction, Object *ob, Scene *scene)
unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* iterate over pointcaches on the active object,
* add spacetimecache and vertex array for each */
/* iterate over pointcaches on the active object, and draw each one's range */
for (pid = pidlist.first; pid; pid = pid->next) {
float col[4];

5
source/blender/editors/space_time/space_time.c
View File

@ -132,8 +132,7 @@ static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene)
unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* iterate over pointcaches on the active object,
* add spacetimecache and vertex array for each */
/* iterate over pointcaches on the active object, drawing */
for (pid = pidlist.first; pid; pid = pid->next) {
float col[4];
@ -811,8 +810,6 @@ static SpaceLink *time_duplicate(SpaceLink *sl)
SpaceTime *stime = (SpaceTime *)sl;
SpaceTime *stimen = MEM_dupallocN(stime);
BLI_listbase_clear(&stimen->caches);
return (SpaceLink *)stimen;
}

10
source/blender/makesdna/DNA_space_types.h
View File

@ -474,14 +474,6 @@ typedef enum eSpaceNla_Flag {
/* Timeline =============================================== */
/* Pointcache drawing data */
# /* Only store the data array in the cache to avoid constant reallocation. */
# /* No need to store when saved. */
typedef struct SpaceTimeCache {
struct SpaceTimeCache *next, *prev;
float *array;
} SpaceTimeCache;
/* Timeline View */
typedef struct SpaceTime {
SpaceLink *next, *prev;
@ -491,8 +483,6 @@ typedef struct SpaceTime {
View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */
ListBase caches;
int cache_display;
int flag;
} SpaceTime;