Merge with trunk r37546
authorMiika Hamalainen <blender@miikah.org>
Thu, 16 Jun 2011 12:00:03 +0000 (12:00 +0000)
committerMiika Hamalainen <blender@miikah.org>
Thu, 16 Jun 2011 12:00:03 +0000 (12:00 +0000)
21 files changed:
1  2 
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/CMakeLists.txt
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/render_texture.c

@@@ -2587,10 -2584,7 +2587,9 @@@ static void draw_mesh_fancy(Scene *scen
        const short is_paint_sel= (ob==OBACT && paint_facesel_test(ob));
        int draw_wire = 0;
        int /* totvert,*/ totedge, totface;
-       DispList *dl;
        DerivedMesh *dm= mesh_get_derived_final(scene, ob, scene->customdata_mask);
 +      ModifierData *md = NULL;
 +      int draw_mode = 0;
  
        if(!dm)
                return;
Simple merge