Commit: 818268b394f810f864c7eff29ab89b3bf787b072
Author: Luca Rood
Date: Mon May 29 16:30:02 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB818268b394f810f864c7eff29ab89b3bf787b072
Fix own mistake with NULL materials in particles
===================================================================
M source/blender/draw/modes/object_mode.c
===================================================================
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index 026f0c4f275..59debb09298 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1467,13 +1467,13 @@ static void OBJECT_cache_populate_particles(Object *ob,
case PART_DRAW_CROSS:
shgrp =
DRW_shgroup_instance_create(e_data.part_prim_sh, psl->particle,
DRW_cache_particles_get_prim(PART_DRAW_CROSS));
DRW_shgroup_uniform_texture(shgrp, "ramp", globals_ramp);
- DRW_shgroup_uniform_vec3(shgrp,
"color", &ma->r, 1);
+ DRW_shgroup_uniform_vec3(shgrp,
"color", ma ? &ma->r : def_prim_col, 1);
DRW_shgroup_uniform_int(shgrp,
"screen_space", &screen_space[0], 1);
break;
case PART_DRAW_CIRC:
shgrp =
DRW_shgroup_instance_create(e_data.part_prim_sh, psl->particle,
DRW_cache_particles_get_prim(PART_DRAW_CIRC));
DRW_shgroup_uniform_texture(shgrp, "ramp", globals_ramp);
- DRW_shgroup_uniform_vec3(shgrp,
"color", &ma->r, 1);
+ DRW_shgroup_uniform_vec3(shgrp,
"color", ma ? &ma->r : def_prim_col, 1);
DRW_shgroup_uniform_int(shgrp,
"screen_space", &screen_space[1], 1);
break;
case PART_DRAW_AXIS:
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
