Merged changes in the trunk up to revision 45383.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 4 Apr 2012 00:50:41 +0000 (00:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 4 Apr 2012 00:50:41 +0000 (00:50 +0000)
13 files changed:
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/render/intern/source/convertblender.c

index 36a3ca4d6f9602050b4c9bcf56db38312d8d2358,31f7cf322bc814622af26e7a94fef3a2c9631676..80666b17eaa16ceeb59c467f89b68ad94af15d11
@@@ -3102,13 -3093,10 +3110,13 @@@ static void draw_em_fancy(Scene *scene
                glDepthMask(0);     // disable write in zbuffer, needed for nice transp
                
                /* don't draw unselected faces, only selected, this is MUCH nicer when texturing */
-               if (CHECK_OB_DRAWTEXTURE(v3d, dt))
+               if (check_object_draw_texture(scene, v3d, dt))
                        col1[3] = 0;
                
 -              draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
 +              if (!(me->drawflag & ME_DRAW_FREESTYLE_FACE))
 +                      col3[3] = 0;
 +
 +              draw_dm_faces_sel(em, cageDM, col1, col2, col3, col4, efa_act);
  
                glDisable(GL_BLEND);
                glDepthMask(1);     // restore write in zbuffer