Merge with trunk r41545
authorMiika Hamalainen <blender@miikah.org>
Sat, 5 Nov 2011 08:04:49 +0000 (08:04 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sat, 5 Nov 2011 08:04:49 +0000 (08:04 +0000)
20 files changed:
1  2 
release/scripts/startup/bl_ui/space_time.py
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/nodes/node_shader_geom.c
source/blender/render/intern/include/texture.h
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge
@@@ -2713,11 -2696,10 +2713,10 @@@ static void draw_mesh_fancy(Scene *scen
        totface = dm->getNumFaces(dm);
        
        /* vertexpaint, faceselect wants this, but it doesnt work for shaded? */
-       if(dt!=OB_SHADED)
-               glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+       glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
  
                // Unwanted combination.
 -      if (is_paint_sel) draw_wire = 0;
 +      if (draw_flags & DRAW_IS_PAINT_SEL) draw_wire = 0;
  
        if(dt==OB_BOUNDBOX) {
                if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
Simple merge