merge from 22606 to 23153
authorLukas Steiblys <imbusy@imbusy.org>
Sat, 12 Sep 2009 18:23:59 +0000 (18:23 +0000)
committerLukas Steiblys <imbusy@imbusy.org>
Sat, 12 Sep 2009 18:23:59 +0000 (18:23 +0000)
1  2 
config/win64-vc-config.py
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/gpu/BL_gpu.vcproj
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/windowmanager/intern/wm_init_exit.c

Simple merge
Simple merge
index 909ddec17ff5432c74644d06337f16facb269b56,b08e8ab5c2b23311fcd083612e125fe8554c2b7f..be31ab45af41e74dc9ae80aa2bc52f0699f9de52
@@@ -618,9 -533,9 +604,9 @@@ static void do_flatten_clay_brush(Sculp
        ActiveData *node= active_verts->first;
        /* area_normal and cntr define the plane towards which vertices are squashed */
        float area_normal[3];
-       float cntr[3], cntr2[3], bstr;
+       float cntr[3], cntr2[3], bstr = 0;
        int flip = 0;
 -
 +      float *buffer;
        calc_area_normal(sd, ss, area_normal, active_verts);
        calc_flatten_center(ss, node, cntr);