svn merge -r41480:41503 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Nov 2011 22:58:05 +0000 (22:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Nov 2011 22:58:05 +0000 (22:58 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/imbuf/intern/moviecache.c
source/blender/makesrna/RNA_access.h
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

index 77e47721e775ea5eb06f9bbdd18859a27840ead6,986e0e2b55287bffe6560e521f69ac216f79dc3d..ee849b4fd8d9f3a872bd9d08354bf09efd59876f
@@@ -1832,14 -1593,17 +1832,17 @@@ static void cgdm_drawFacesTex_common(De
        int i, totface, flag, gridSize = ccgSubSurf_getGridSize(ss);
        int gridFaces = gridSize - 1;
  
 -      ccgdm_pbvh_update(ccgdm);
 +      ccgdm_pbvh_update(cgdm);
  
        if(!mcol)
 -              mcol = dm->getFaceDataArray(dm, CD_MCOL);
 +              mcol = dm->getTessFaceDataArray(dm, CD_MCOL);
  
 -              mcol = dm->getFaceDataArray(dm, CD_TEXTURE_MCOL);
+       if(!mcol)
++              mcol = dm->getTessFaceDataArray(dm, CD_TEXTURE_MCOL);
        totface = ccgSubSurf_getNumFaces(ss);
        for(i = 0; i < totface; i++) {
 -              CCGFace *f = ccgdm->faceMap[i].face;
 +              CCGFace *f = cgdm->faceMap[i].face;
                int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(f);
                int drawSmooth, index = ccgDM_getFaceMapIndex(ss, f);
                int origIndex = GET_INT_FROM_POINTER(ccgSubSurf_getFaceFaceHandle(ss, f));
Simple merge
index 40da1024a565931f7aba4bd783fdabcc94504cf6,f32e2afa3e08c6cc601a40187603c51b89ee832d..405ec082102b3c6f704b2b4760b87c84f027f83f
  #include "BKE_sequencer.h" /* free seq clipboard */
  #include "BKE_material.h" /* clear_matcopybuf */
  
- #include "BLI_blenlib.h"
+ #include "BLI_listbase.h"
+ #include "BLI_string.h"
+ #include "BLI_utildefines.h"
 +#include "BLI_cellalloc.h"
- #include "BLI_winstuff.h"
  
  #include "RE_engine.h"
  #include "RE_pipeline.h"              /* RE_ free stuff */
Simple merge