Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 22 Jan 2017 20:16:00 +0000 (21:16 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 22 Jan 2017 20:16:00 +0000 (21:16 +0100)
Conflicts:
source/blender/editors/space_action/action_draw.c

1  2 
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform.c

Simple merge
@@@ -254,8 -249,36 +256,36 @@@ void draw_channel_strips(bAnimContext *
                                                }
                                                case ANIMTYPE_GROUP:
                                                {
-                                                       if (sel) immUniformColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
-                                                       else immUniformColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
+                                                       bActionGroup *agrp = ale->data;
+                                                       if (show_group_colors && agrp->customCol) {
+                                                               if (sel) {
+                                                                       unsigned char *cp = agrp->cs.select;
 -                                                                      glColor4ub(cp[0], cp[1], cp[2], 0x45);
++                                                                      immUniformColor4ub(cp[0], cp[1], cp[2], 0x45);
+                                                               }
+                                                               else {
+                                                                       unsigned char *cp = agrp->cs.solid;
 -                                                                      glColor4ub(cp[0], cp[1], cp[2], 0x1D);
++                                                                      immUniformColor4ub(cp[0], cp[1], cp[2], 0x1D);
+                                                               }
+                                                       }
+                                                       else {
 -                                                              if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
 -                                                              else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
++                                                              if (sel) immUniformColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
++                                                              else immUniformColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
+                                                       }
+                                                       break;
+                                               }
+                                               case ANIMTYPE_FCURVE:
+                                               {
+                                                       FCurve *fcu = ale->data;
+                                                       if (show_group_colors && fcu->grp && fcu->grp->customCol) {
+                                                               unsigned char *cp = fcu->grp->cs.active;
+                                                               
 -                                                              if (sel) glColor4ub(cp[0], cp[1], cp[2], 0x65);
 -                                                              else glColor4ub(cp[0], cp[1], cp[2], 0x0B);
++                                                              if (sel) immUniformColor4ub(cp[0], cp[1], cp[2], 0x65);
++                                                              else immUniformColor4ub(cp[0], cp[1], cp[2], 0x0B);
+                                                       }
+                                                       else {
 -                                                              if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
 -                                                              else glColor4ub(col2[0], col2[1], col2[2], 0x22);
++                                                              if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x22);
++                                                              else immUniformColor4ub(col2[0], col2[1], col2[2], 0x22);
+                                                       }
                                                        break;
                                                }
                                                default: