merge from 22016 to 22335
authorLukas Steiblys <imbusy@imbusy.org>
Mon, 10 Aug 2009 11:34:56 +0000 (11:34 +0000)
committerLukas Steiblys <imbusy@imbusy.org>
Mon, 10 Aug 2009 11:34:56 +0000 (11:34 +0000)
1  2 
CMakeLists.txt
config/win64-vc-config.py
projectfiles_vc9/blender/blender.sln
source/blender/blenkernel/BKE_sculpt.h
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/windowmanager/intern/wm_init_exit.c

diff --cc CMakeLists.txt
index fc6a3d3ade8067a7ea2a3318ec750013ee64dc22,895af9d1a1c174881ed4ccf3a441ab7cb1dcd585..83aebf85eb06ea4378c0f3857731e75fd35844d6
@@@ -196,10 -209,10 +209,10 @@@ IF(WIN32
    ENDIF(CMAKE_CL_64)
  
    SET(PYTHON ${LIBDIR}/python)
--  SET(PYTHON_VERSION 2.6)
++  SET(PYTHON_VERSION 3.1)
    SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
    SET(PYTHON_BINARY python)
--  SET(PYTHON_LIB python26)
++  SET(PYTHON_LIB python31)
    SET(PYTHON_LIBPATH ${PYTHON}/lib)
  
    IF(CMAKE_CL_64)
Simple merge
Simple merge
index 18902c45f62780ee7107c693a5c8934630eb2713,94d3f39d1722a51b558cc6e35899824c63705f7a..f551ce768ae587911466efb2c0d7a69ce713589e
@@@ -508,9 -456,8 +506,9 @@@ static void do_layer_brush(Sculpt *sd, 
  
        calc_area_normal(sd, area_normal, active_verts);
  
 +      buffer = (float *)GPU_buffer_lock( ss->drawobject->vertices );
        while(node){
-               float *disp= &ss->cache->layer_disps[node->Index];
+               float *disp= &ss->layer_disps[node->Index];
                float *co= ss->mvert[node->Index].co;
                float val[3];
                
                if((lim < 0 && *disp < lim) || (lim > 0 && *disp > lim))
                        *disp = lim;
                
-               val[0] = ss->cache->mesh_store[node->Index][0]+area_normal[0] * *disp*ss->cache->scale[0];
-               val[1] = ss->cache->mesh_store[node->Index][1]+area_normal[1] * *disp*ss->cache->scale[1];
-               val[2] = ss->cache->mesh_store[node->Index][2]+area_normal[2] * *disp*ss->cache->scale[2];
+               val[0] = ss->mesh_co_orig[node->Index][0]+area_normal[0] * *disp*ss->cache->scale[0];
+               val[1] = ss->mesh_co_orig[node->Index][1]+area_normal[1] * *disp*ss->cache->scale[1];
+               val[2] = ss->mesh_co_orig[node->Index][2]+area_normal[2] * *disp*ss->cache->scale[2];
  
 +              if( buffer != 0 ) {
 +                      IndexLink *cur = &ss->drawobject->indices[node->Index];
 +                      while( cur != 0 && cur->element != -1 ) {
 +                              sculpt_clip(sd, &buffer[cur->element*3], val);
 +                              cur = cur->next;
 +                      }
 +              }
 +
                sculpt_clip(sd, co, val);
  
                node= node->next;
@@@ -1473,14 -1361,12 +1477,14 @@@ static void sculpt_restore_mesh(Sculpt 
  {
        SculptSession *ss = sd->session;
        StrokeCache *cache = ss->cache;
 +      float *buffer;
        int i;
 -      
 +
        /* Restore the mesh before continuing with anchored stroke */
-       if((sd->brush->flag & BRUSH_ANCHORED) && cache->mesh_store) {
+       if((sd->brush->flag & BRUSH_ANCHORED) && ss->mesh_co_orig) {
 +              buffer = (float *)GPU_buffer_lock( ss->drawobject->normals );
                for(i = 0; i < ss->totvert; ++i) {
-                       VecCopyf(ss->mvert[i].co, cache->mesh_store[i]);
+                       VecCopyf(ss->mvert[i].co, ss->mesh_co_orig[i]);
                        ss->mvert[i].no[0] = cache->orig_norms[i][0];
                        ss->mvert[i].no[1] = cache->orig_norms[i][1];
                        ss->mvert[i].no[2] = cache->orig_norms[i][2];