Commit: 819035691137313993d517f9d41ef13217f3effc Author: Campbell Barton Date: Thu Mar 30 17:23:56 2017 +1100 Branches: custom-manipulators https://developer.blender.org/rB819035691137313993d517f9d41ef13217f3effc
Merge branch 'blender2.8' into custom-manipulators =================================================================== =================================================================== diff --cc source/blender/editors/screen/area.c index a6e1d545320,cc47667772d..854fcf20fbc --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@@ -76,12 -72,9 +76,12 @@@ #include "UI_resources.h" #include "UI_view2d.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" + #include "screen_intern.h" - extern void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3); /* xxx temp */ + extern void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3, const float color[4]); /* xxx temp */ /* general area and region code */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
