diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-02 20:17:33 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-03 17:12:00 +0400 |
| commit | 74ddfb81c9f274c87114c7ba890f3ab3a46503ce (patch) | |
| tree | 04b9df9e0a7cef8992433417f0e6360a8ebeb321 | |
| parent | 886cdaddbef29c5dc95ccf58f15074abb4622188 (diff) | |
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
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index aaaa8838987..a5042726593 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; |