diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-28 15:30:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-28 15:30:37 +0300 |
| commit | 5196da4b98d16ce6ea521a77a5a63326e81cac84 (patch) | |
| tree | 6708406e4ec59a78bc97abecb47e6247774b7cf5 /source | |
| parent | 0e76c52033648608e5607afb2df940473e0e55f4 (diff) | |
Cleanup: warning/style
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/util/undo.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 6210d053c9d..5b4322e6cf4 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -410,8 +410,10 @@ static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, O solidtex = false; Gtexdraw.is_lit = 0; } - else if (v3d->drawtype == OB_SOLID || ((ob->mode & OB_MODE_EDIT) && v3d->drawtype != OB_TEXTURE) || - (BKE_scene_use_new_shading_nodes(scene) && (ob->mode & OB_MODE_TEXTURE_PAINT))) { + else if ((v3d->drawtype == OB_SOLID) || + ((ob->mode & OB_MODE_EDIT) && (v3d->drawtype != OB_TEXTURE)) || + ((ob->mode & OB_MODE_TEXTURE_PAINT) && BKE_scene_use_new_shading_nodes(scene))) + { /* draw with default lights in solid draw mode and edit mode */ solidtex = true; Gtexdraw.is_lit = -1; diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 483bb88b91c..681001e7ed7 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -76,7 +76,6 @@ void ED_undo_push(bContext *C, const char *str) { - wmWindowManager *wm = CTX_wm_manager(C); Object *obedit = CTX_data_edit_object(C); Object *obact = CTX_data_active_object(C); |