svn merge ^/trunk/blender -r42139:42172
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Nov 2011 16:29:14 +0000 (16:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Nov 2011 16:29:14 +0000 (16:29 +0000)
20 files changed:
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/intern/wm_gesture.c
source/creator/creator.c

Simple merge
@@@ -263,14 -219,14 +263,14 @@@ static void draw_uvs_stretch(SpaceImag
                                                else
                                                        areadiff = 1.0f-(area/uvarea);
                                                
-                                               weight_to_rgb(areadiff, col, col+1, col+2);
+                                               weight_to_rgb(col, areadiff);
                                                glColor3fv(col);
                                                
 -                                              glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
 -                                                      glVertex2fv(tf->uv[0]);
 -                                                      glVertex2fv(tf->uv[1]);
 -                                                      glVertex2fv(tf->uv[2]);
 -                                                      if(efa->v4) glVertex2fv(tf->uv[3]);
 +                                              glBegin(GL_POLYGON);
 +                                              BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 +                                                      luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
 +                                                      glVertex2fv(luv->uv);
 +                                              }
                                                glEnd();
                                        }
                                }
Simple merge