Commit: 480d9eab732662e8fec7d55f28dcb8b310356df8
Author: Sergey Sharybin
Date: Thu Oct 2 18:17:33 2014 +0200
Branches: master
https://developer.blender.org/rB480d9eab732662e8fec7d55f28dcb8b310356df8
Fix black matcap when using particle system
Using matcap with a displist is not really good thing to try
and it's actually a regression since we've enabled matcaps
for all objects instead of just an active one.
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 994f2df..5a32820 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2075,7 +2075,7 @@ static void draw_dupli_objects_color(
!bb_tmp ||
draw_glsl_material(scene, dob->ob, v3d,
dt) ||
check_object_draw_texture(scene, v3d, dt)
||
- (base->object == OBACT && v3d->flag2 &
V3D_SOLID_MATCAP))
+ (v3d->flag2 & V3D_SOLID_MATCAP) != 0)
{
// printf("draw_dupli_objects_color:
skipping displist for %s\n", dob->ob->id.name + 2);
use_displist = false;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
