Merge remote-tracking branch 'origin/blender-v2.81-release'

This commit is contained in:
Dalai Felinto 2019-11-11 15:30:57 -03:00
commit 7afec5bea1
1 changed files with 2 additions and 1 deletions

View File

@ -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,