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-02 20:17:33 +0400 |
| commit | 480d9eab732662e8fec7d55f28dcb8b310356df8 (patch) | |
| tree | c1bd98369cba5d5ce65abe9344b5f157459f553b /source/blender/editors/space_view3d | |
| parent | bcab08c50a6e26cd39c25515e71e7e9f9a8eccc4 (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.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -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 994f2df8587..5a32820af75 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; |