Commit: 74ddfb81c9f274c87114c7ba890f3ab3a46503ce
Author: Sergey Sharybin
Date: Thu Oct 2 18:17:33 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB74ddfb81c9f274c87114c7ba890f3ab3a46503ce
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.
Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
===================================================================
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 aaaa883..a504272 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
