diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-21 13:15:43 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-21 13:17:43 +0400 |
| commit | 1781928f9d720fa1dc4811afb69935b35aa89878 (patch) | |
| tree | e008b5698194b51c81778ca19a5d145ef99e2060 | |
| parent | 0f95149a7849005d7b82004137dd49146a60b8fa (diff) | |
Fix T39305: Matcap Crash when using Material Nodes in Blender Internal
This is a regression in d34d745, texture painting didn't set is_paint
if draw type < DT_SOLID which is weird.
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 9bb353670fc..daa6ea0a95a 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -6806,14 +6806,13 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short if (dt < OB_SOLID) { zbufoff = 1; dt = OB_SOLID; - is_paint = true; } if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) { dt = OB_PAINT; - is_paint = true; } + is_paint = true; glEnable(GL_DEPTH_TEST); } } |