diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-12 12:49:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-12 12:51:14 +0300 |
| commit | 0c9a2def8b1e40a0b5a3ed348d1fd92cc13096ff (patch) | |
| tree | 8749b8080b9b02514cc7f9d08dab6391ce716844 /source/blender/draw/modes/edit_armature_mode.c | |
| parent | b380f4927e30bc2877b4f3a760fefa0dfc3614e1 (diff) | |
Draw Engine: remove hard coded limit on array sizes
This removes MAX_STORAGE, MAX_BUFFERS, MAX_TEXTURES, MAX_PASSES limits.
Actual memory saving isn't so important, it just means we don't need to
manually bump these based on changes to engines.
Diffstat (limited to 'source/blender/draw/modes/edit_armature_mode.c')
| -rw-r--r-- | source/blender/draw/modes/edit_armature_mode.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/draw/modes/edit_armature_mode.c b/source/blender/draw/modes/edit_armature_mode.c index 6111b9b160b..68e3112f03b 100644 --- a/source/blender/draw/modes/edit_armature_mode.c +++ b/source/blender/draw/modes/edit_armature_mode.c @@ -35,24 +35,22 @@ extern GlobalsUboStorage ts; /* *********** LISTS *********** */ -/* keep it under MAX_PASSES */ typedef struct EDIT_ARMATURE_PassList { struct DRWPass *bone_solid; struct DRWPass *bone_wire; struct DRWPass *relationship; } EDIT_ARMATURE_PassList; -/* keep it under MAX_STORAGE */ typedef struct EDIT_ARMATURE_StorageList { struct g_data *g_data; } EDIT_ARMATURE_StorageList; typedef struct EDIT_ARMATURE_Data { void *engine_type; - void *fbl; - void *txl; + char *fbl; + char *txl; EDIT_ARMATURE_PassList *psl; - void *stl; + EDIT_ARMATURE_StorageList *stl; } EDIT_ARMATURE_Data; /* *********** STATIC *********** */ @@ -126,9 +124,12 @@ void EDIT_ARMATURE_collection_settings_create(CollectionEngineSettings *ces) } #endif +static const DrawEngineDataSize EDIT_ARMATURE_data_size = DRW_VIEWPORT_DATA_SIZE(EDIT_ARMATURE_Data); + DrawEngineType draw_engine_edit_armature_type = { NULL, NULL, N_("EditArmatureMode"), + &EDIT_ARMATURE_data_size, NULL, NULL, &EDIT_ARMATURE_cache_init, |