Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 20 May 2017 04:19:05 +0000 (14:19 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 20 May 2017 04:19:05 +0000 (14:19 +1000)
24 files changed:
1  2 
CMakeLists.txt
source/blender/blenkernel/intern/mball_tessellate.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/armature/reeb.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/gpu/intern/gpu_debug.c
source/blender/render/intern/source/convertblender.c

diff --cc CMakeLists.txt
Simple merge
index bb6a8676cc1eb28a2913f0fddb0be73c5b0956e5,255fc0d6f8f5e266deb58f823ad5d3344908016c..561c29b68ccc7d928726920c3edf46228edc7d77
@@@ -386,12 -352,17 +386,12 @@@ static void nla_draw_strip(SpaceNla *sn
                                 */
                                if (strip->prev == NULL) {
                                        /* set the drawing color to the color of the strip, but with very faint alpha */
 -                                      glColor4f(color[0], color[1], color[2], 0.15f);
 -                                      
 +                                      immUniformColor3fvAlpha(color, 0.15f);
 +
                                        /* draw the rect to the edge of the screen */
 -                                      glBegin(GL_QUADS);
 -                                      glVertex2f(v2d->cur.xmin, yminc);
 -                                      glVertex2f(v2d->cur.xmin, ymaxc);
 -                                      glVertex2f(strip->start, ymaxc);
 -                                      glVertex2f(strip->start, yminc);
 -                                      glEnd();
 +                                      immRectf(shdr_pos, v2d->cur.xmin, yminc, strip->start, ymaxc);
                                }
-                               /* fall-through */
+                               ATTR_FALLTHROUGH;
  
                        /* this only draws after the strip */
                        case NLASTRIP_EXTEND_HOLD_FORWARD: 
index 02ad292e5c1d6c57095483808e52d583b5ff05d6,cebc024fab96cd129356db5c6ad131b142a2e137..be5b475b89b85e2dc4d2c4713953ab7e25df4639
@@@ -1616,32 -1605,34 +1616,32 @@@ static void drawArrow(ArrowDirection d
                        offset = -offset;
                        length = -length;
                        size = -size;
-                       /* fall-through */
+                       ATTR_FALLTHROUGH;
                case RIGHT:
 -                      glBegin(GL_LINES);
 -                      glVertex2s(offset, 0);
 -                      glVertex2s(offset + length, 0);
 -                      glVertex2s(offset + length, 0);
 -                      glVertex2s(offset + length - size, -size);
 -                      glVertex2s(offset + length, 0);
 -                      glVertex2s(offset + length - size,  size);
 -                      glEnd();
 +                      immVertex2f(POS_INDEX, offset, 0);
 +                      immVertex2f(POS_INDEX, offset + length, 0);
 +                      immVertex2f(POS_INDEX, offset + length, 0);
 +                      immVertex2f(POS_INDEX, offset + length - size, -size);
 +                      immVertex2f(POS_INDEX, offset + length, 0);
 +                      immVertex2f(POS_INDEX, offset + length - size,  size);
                        break;
  
                case DOWN:
                        offset = -offset;
                        length = -length;
                        size = -size;
-                       /* fall-through */
+                       ATTR_FALLTHROUGH;
                case UP:
 -                      glBegin(GL_LINES);
 -                      glVertex2s(0, offset);
 -                      glVertex2s(0, offset + length);
 -                      glVertex2s(0, offset + length);
 -                      glVertex2s(-size, offset + length - size);
 -                      glVertex2s(0, offset + length);
 -                      glVertex2s(size, offset + length - size);
 -                      glEnd();
 +                      immVertex2f(POS_INDEX, 0, offset);
 +                      immVertex2f(POS_INDEX, 0, offset + length);
 +                      immVertex2f(POS_INDEX, 0, offset + length);
 +                      immVertex2f(POS_INDEX, -size, offset + length - size);
 +                      immVertex2f(POS_INDEX, 0, offset + length);
 +                      immVertex2f(POS_INDEX, size, offset + length - size);
                        break;
        }
 +
 +      immEnd();
  }
  
  static void drawArrowHead(ArrowDirection d, short size)
        switch (d) {
                case LEFT:
                        size = -size;
-                       /* fall-through */
+                       ATTR_FALLTHROUGH;
                case RIGHT:
 -                      glBegin(GL_LINES);
 -                      glVertex2s(0, 0);
 -                      glVertex2s(-size, -size);
 -                      glVertex2s(0, 0);
 -                      glVertex2s(-size,  size);
 -                      glEnd();
 +                      immVertex2f(POS_INDEX, 0, 0);
 +                      immVertex2f(POS_INDEX, -size, -size);
 +                      immVertex2f(POS_INDEX, 0, 0);
 +                      immVertex2f(POS_INDEX, -size,  size);
                        break;
  
                case DOWN:
                        size = -size;
-                       /* fall-through */
+                       ATTR_FALLTHROUGH;
                case UP:
 -                      glBegin(GL_LINES);
 -                      glVertex2s(0, 0);
 -                      glVertex2s(-size, -size);
 -                      glVertex2s(0, 0);
 -                      glVertex2s(size, -size);
 -                      glEnd();
 +                      immVertex2f(POS_INDEX, 0, 0);
 +                      immVertex2f(POS_INDEX, -size, -size);
 +                      immVertex2f(POS_INDEX, 0, 0);
 +                      immVertex2f(POS_INDEX, size, -size);
                        break;
        }
 +
 +      immEnd();
  }
  
  static void drawArc(float size, float angle_start, float angle_end, int segments)
Simple merge