svn merge ^/trunk/blender -r43564:43609
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jan 2012 18:04:35 +0000 (18:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jan 2012 18:04:35 +0000 (18:04 +0000)
28 files changed:
1  2 
build_files/cmake/cmake_static_check_cppcheck.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/ED_object.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/convertblender.c

index a9ab22ca98b8d2a91ac62697ca12331bfd0f5f37,6c13f3a079a12826d46a01a86468be393b71ef45..aba199876981f3f2ecc663c91881a70a2d0ce420
@@@ -37,9 -37,10 +37,10 @@@ CHECKER_BIN = "cppcheck
  CHECKER_ARGS = [
      # not sure why this is needed, but it is.
      "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
+       "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+     # "--max-configs=1",  # speeds up execution
      #  "--check-config", # when includes are missing
 -    #  "--enable=all",  # if you want sixty hundred pedantic suggestions
 +    "--enable=all",  # if you want sixty hundred pedantic suggestions
      ]
  
  
index 52a505998e1b29761c8e7c9a1c9ef4d24088a761,ffcbd0bdc562d1c924466af833bf1d8cd5535819..76077fe3a14fd89695c7439225eefc21afabc40f
@@@ -384,27 -367,12 +388,27 @@@ static void set_subsurf_uv(CCGSubSurf *
  
                        for(y = 0; y < gridFaces; y++) {
                                for(x = 0; x < gridFaces; x++) {
-                                       float *a = faceGridData[(y + 0)*gridSize + x + 0].co;
-                                       float *b = faceGridData[(y + 0)*gridSize + x + 1].co;
-                                       float *c = faceGridData[(y + 1)*gridSize + x + 1].co;
-                                       float *d = faceGridData[(y + 1)*gridSize + x + 0].co;
 -                                      copy_v2_v2(tf->uv[0], faceGridData[(y + 0)*gridSize + x + 0]);
 -                                      copy_v2_v2(tf->uv[1], faceGridData[(y + 1)*gridSize + x + 0]);
 -                                      copy_v2_v2(tf->uv[2], faceGridData[(y + 1)*gridSize + x + 1]);
 -                                      copy_v2_v2(tf->uv[3], faceGridData[(y + 0)*gridSize + x + 1]);
++                                      float *a = faceGridData[(y + 0)*gridSize + x + 0];
++                                      float *b = faceGridData[(y + 0)*gridSize + x + 1];
++                                      float *c = faceGridData[(y + 1)*gridSize + x + 1];
++                                      float *d = faceGridData[(y + 1)*gridSize + x + 0];
 +
 +                                      if (tface) {
 +                                              tf->uv[0][0] = a[0]; tf->uv[0][1] = a[1];
 +                                              tf->uv[1][0] = d[0]; tf->uv[1][1] = d[1];
 +                                              tf->uv[2][0] = c[0]; tf->uv[2][1] = c[1];
 +                                              tf->uv[3][0] = b[0]; tf->uv[3][1] = b[1];
 +                                      }
 +
 +                                      if (mloopuv) {
 +                                              mluv[0].uv[0] = a[0]; mluv[0].uv[1] = a[1];
 +                                              mluv[1].uv[0] = d[0]; mluv[1].uv[1] = d[1];
 +                                              mluv[2].uv[0] = c[0]; mluv[2].uv[1] = c[1];
 +                                              mluv[3].uv[0] = b[0]; mluv[3].uv[1] = b[1];
 +                                      }
  
                                        tf++;
 +                                      mluv+=4;
                                }
                        }
                }
@@@ -3303,15 -2835,9 +3307,15 @@@ struct DerivedMesh *subsurf_make_derive
                }
  
                if(useIncremental && isFinalCalc) {
-                       smd->mCache = ss = _getSubSurf(smd->mCache, levels, useAging);
+                       smd->mCache = ss = _getSubSurf(smd->mCache, levels, useAging|CCG_CALC_NORMALS);
  
 -                      ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple);
 +                      if (!ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple)) {
 +                              //ccgSubSurf_free(smd->mCache);
 +                              smd->mCache = ss = _getSubSurf(NULL, levels, useAging);
 +                              
 +                              ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple);
 +      
 +                      }
  
                        result = getCCGDerivedMesh(smd->mCache,
                                                                           drawInteriorEdges,
Simple merge