diff options
| author | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-06-05 18:51:46 +0300 |
| commit | 87a821397fa4db7b72ea809ee29c319cf4788a1a (patch) | |
| tree | 5b14c3657585b7e64ce1a3e14492925e0a79f473 /source/blender/draw/intern/draw_cache_impl_displist.c | |
| parent | d6e9b0ce5d61f64a3879459c9d39a151aabdea81 (diff) | |
| parent | edaaa2afddb2132e56f39791e559b084b6df8773 (diff) | |
Merge branch 'master' into asset-system-filelistasset-system-filelist
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_displist.c')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_displist.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c index d606f70db9e..ee16cb1a022 100644 --- a/source/blender/draw/intern/draw_cache_impl_displist.c +++ b/source/blender/draw/intern/draw_cache_impl_displist.c @@ -532,6 +532,8 @@ void DRW_displist_vertbuf_create_loop_pos_and_nor_and_uv_and_tan(ListBase *lb, GPUVertBufRaw uv_step = {0}; GPUVertBufRaw tan_step = {0}; +#define DRW_TEST_ASSIGN_VBO(v) (v = (DRW_vbo_requested(v) ? (v) : NULL)) + if (DRW_TEST_ASSIGN_VBO(vbo_pos_nor)) { GPU_vertbuf_init_with_format(vbo_pos_nor, do_hq_normals ? &format_pos_nor_hq : &format_pos_nor); @@ -550,6 +552,8 @@ void DRW_displist_vertbuf_create_loop_pos_and_nor_and_uv_and_tan(ListBase *lb, GPU_vertbuf_attr_get_raw_data(vbo_tan, tan_id, &tan_step); } +#undef DRW_TEST_ASSIGN_VBO + BKE_displist_normals_add(lb); LISTBASE_FOREACH (const DispList *, dl, lb) { |