diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 01:29:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 01:50:00 +0300 |
commit | 8f817de0cbef41dac81e6c7665ada509c3fe2988 (patch) | |
tree | 0802c3287116ce0bf600adc4bed8cba31cfc97b1 /source/blender/gpu | |
parent | e68ac2827dd4f8ad346011a8a408b342e2718707 (diff) |
Cleanup: use plural names for Main lists
Convention was not to but after discussion on 918941483f7e we agree its
best to change the convention.
Names now mostly follow RNA.
Some exceptions:
- Use 'nodetrees' instead of 'nodegroups'
since the struct is called NodeTree.
- Use 'gpencils' instead of 'grease_pencil'
since 'gpencil' is a common abbreviation in the C code.
Other exceptions:
- Leave 'wm' as it's a list of one.
- Leave 'ipo' as is for versioning.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 12 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 5d6b09f476b..62dcbb94d1c 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -597,7 +597,7 @@ void GPU_paint_set_mipmap(Main *bmain, bool mipmap) GTS.texpaint = !mipmap; if (mipmap) { - for (Image *ima = bmain->image.first; ima; ima = ima->id.next) { + for (Image *ima = bmain->images.first; ima; ima = ima->id.next) { if (BKE_image_has_opengl_texture(ima)) { if (ima->gpuflag & IMA_GPU_MIPMAP_COMPLETE) { if (ima->gputexture[TEXTARGET_TEXTURE_2D]) { @@ -616,7 +616,7 @@ void GPU_paint_set_mipmap(Main *bmain, bool mipmap) } else { - for (Image *ima = bmain->image.first; ima; ima = ima->id.next) { + for (Image *ima = bmain->images.first; ima; ima = ima->id.next) { if (BKE_image_has_opengl_texture(ima)) { if (ima->gputexture[TEXTARGET_TEXTURE_2D]) { GPU_texture_bind(ima->gputexture[TEXTARGET_TEXTURE_2D], 0); @@ -1119,7 +1119,7 @@ void GPU_free_unused_buffers(Main *bmain) Image *ima = node->link; /* check in case it was freed in the meantime */ - if (bmain && BLI_findindex(&bmain->image, ima) != -1) + if (bmain && BLI_findindex(&bmain->images, ima) != -1) GPU_free_image(ima); } @@ -1155,7 +1155,7 @@ void GPU_free_image(Image *ima) void GPU_free_images(Main *bmain) { if (bmain) { - for (Image *ima = bmain->image.first; ima; ima = ima->id.next) { + for (Image *ima = bmain->images.first; ima; ima = ima->id.next) { GPU_free_image(ima); } } @@ -1165,7 +1165,7 @@ void GPU_free_images(Main *bmain) void GPU_free_images_anim(Main *bmain) { if (bmain) { - for (Image *ima = bmain->image.first; ima; ima = ima->id.next) { + for (Image *ima = bmain->images.first; ima; ima = ima->id.next) { if (BKE_image_is_animated(ima)) { GPU_free_image(ima); } @@ -1192,7 +1192,7 @@ void GPU_free_images_old(Main *bmain) lasttime = ctime; - Image *ima = bmain->image.first; + Image *ima = bmain->images.first; while (ima) { if ((ima->flag & IMA_NOCOLLECT) == 0 && ctime - ima->lastused > U.textimeout) { /* If it's in GL memory, deallocate and set time tag to current time diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index ac5cd93d77e..302b3b4ef1c 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -754,10 +754,10 @@ void GPU_materials_free(Main *bmain) World *wo; extern Material defmaterial; - for (ma = bmain->mat.first; ma; ma = ma->id.next) + for (ma = bmain->materials.first; ma; ma = ma->id.next) GPU_material_free(&ma->gpumaterial); - for (wo = bmain->world.first; wo; wo = wo->id.next) + for (wo = bmain->worlds.first; wo; wo = wo->id.next) GPU_material_free(&wo->gpumaterial); GPU_material_free(&defmaterial.gpumaterial); |