diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-11-11 21:30:57 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-11-11 21:30:57 +0300 |
| commit | 7afec5bea195bbc876bcc0bcc05e32ad55f539b8 (patch) | |
| tree | 85c75cc51ae3d9a71f0bc85bb47c4727500fa146 /source | |
| parent | 37bfb1fe17840fcdf90704cbee5904ac2f6b788c (diff) | |
| parent | 8c9e6f123a2b26cb6cc7585a49fb2a09bdeba09d (diff) | |
Merge remote-tracking branch 'origin/blender-v2.81-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 781c7e6a488..80793726afe 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -510,12 +510,13 @@ static void OBJECT_engine_init(void *vedata) NULL, datatoc_gpu_shader_flat_color_frag_glsl, datatoc_common_view_lib_glsl, - NULL); + "#define IN_PLACE_INSTANCES\n"); sh_data->part_axis = DRW_shader_create_with_lib(datatoc_object_particle_prim_vert_glsl, NULL, datatoc_gpu_shader_flat_color_frag_glsl, datatoc_common_view_lib_glsl, + "#define IN_PLACE_INSTANCES\n" "#define USE_AXIS\n"); sh_data->part_dot = DRW_shader_create_with_lib(datatoc_object_particle_dot_vert_glsl, |