[Bf-blender-cvs] [13a091b] UI-experiments: Merge branch 'master' into UI-experiments
Julian Eisel
noreply at git.blender.org
Sat Aug 1 22:05:18 CEST 2015
Commit: 13a091bd61530b7f2bde702d2438cea0493792de
Author: Julian Eisel
Date: Sat Aug 1 21:20:49 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB13a091bd61530b7f2bde702d2438cea0493792de
Merge branch 'master' into UI-experiments
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_blender.h
index 14048ba,2a9583b..1032e32
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -42,7 -42,7 +42,7 @@@ extern "C"
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 275
- #define BLENDER_SUBVERSION 3
-#define BLENDER_SUBVERSION 4
++#define BLENDER_SUBVERSION 5
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 5
diff --cc source/blender/blenloader/intern/versioning_270.c
index b3780ff,1e309f5..571a8cc
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -843,47 -843,12 +843,56 @@@ void blo_do_versions_270(FileData *fd,
}
}
+ if (!MAIN_VERSION_ATLEAST(main, 275, 3)) {
+ Brush *br;
+ #define BRUSH_TORUS (1 << 1)
+ for (br = main->brush.first; br; br = br->id.next) {
+ br->flag &= ~BRUSH_TORUS;
+ }
+ #undef BRUSH_TORUS
+ }
++
+ {
+ bScreen *screen;
+ for (screen = main->screen.first; screen; screen = screen->id.next) {
+ ScrArea *sa;
+
+ for (sa = screen->areabase.first; sa; sa = sa->next) {
+ const char needed_type = (sa->spacetype == SPACE_CLIP) ? RGN_TYPE_PREVIEW : RGN_TYPE_WINDOW;
+ ARegion *ar = BKE_area_find_region_type(sa, needed_type);
+ SpaceLink *sl;
+
+ if (ar == NULL)
+ continue;
+
+ for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ switch (sl->spacetype) {
+ case SPACE_TIME:
+ case SPACE_ACTION:
+ case SPACE_NLA:
+ ar->v2d.flag |= V2D_USES_UNITS_HORIZONTAL;
+ break;
+ case SPACE_IPO:
+ case SPACE_SEQ:
+ ar->v2d.flag |= (V2D_USES_UNITS_HORIZONTAL | V2D_USES_UNITS_VERTICAL);
+ break;
+ case SPACE_CLIP:
+ {
+ SpaceClip *sc = (SpaceClip *)sl;
+
+ if (sc->view == SC_VIEW_DOPESHEET) {
+ ar->v2d.flag |= V2D_USES_UNITS_HORIZONTAL;
+ }
+ else if (sc->view == SC_VIEW_GRAPH) {
+ ar->v2d.flag |= (V2D_USES_UNITS_HORIZONTAL | V2D_USES_UNITS_VERTICAL);
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ }
+ }
+ }
}
diff --cc source/blender/editors/interface/resources.c
index 35c4ef0,5eaee73..c64565c
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2641,55 -2635,10 +2641,59 @@@ void init_userdef_do_versions(void
U.ndof_deadzone = 0.1;
}
+ if (!USER_VERSION_ATLEAST(275, 4)) {
+ U.node_margin = 80;
+ }
+
+ if (!USER_VERSION_ATLEAST(275, 3)) {
+ bTheme *btheme;
+ ThemeSpace *ts;
+
+ /* interface_widgets.c */
+ struct uiWidgetColors wcol_tab = {
+ {255, 255, 255, 255},
+ {83, 83, 83, 255}, /* gets overwritten later */
+ {114, 114, 114, 255}, /* gets overwritten later */
+ {90, 90, 90, 255},
+
+ {0, 0, 0, 255}, /* gets overwritten later */
+ {0, 0, 0, 255},
+
+ 0,
+ 0, 0
+ };
+
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ btheme->tui.wcol_tab = wcol_tab;
+ for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
+ copy_v4_v4_char(ts->tabs.tab_active, ts->tab_active);
+ copy_v4_v4_char(ts->tabs.tab_inactive, ts->tab_inactive);
+ copy_v4_v4_char(ts->tabs.tab_back, ts->tab_back);
+ copy_v4_v4_char(ts->tabs.tab_outline, ts->tab_outline);
+ }
+ }
+ }
+
+ if (!USER_VERSION_ATLEAST(275, 3)) {
+ bTheme *btheme;
+ ThemeSpace *ts;
+
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
+ /* XXX maybe remove show_back/show_header options? */
+ ts->panelcolors.show_back = ts->panelcolors.show_header = true;
+ rgba_char_args_set(ts->panelcolors.back, 128, 128, 128, 255);
+ rgba_char_args_set(ts->panelcolors.header, 97, 97, 97, 255);
+ }
+
+ rgba_char_args_set_fl(btheme->tui.area_edges, 0.10f, 0.10f, 0.10f, 1.0f);
+
+ btheme->tui.interface_style = TH_IFACE_STYLE_FLAT;
+
+ ui_widget_color_init(&btheme->tui);
+ }
+ }
+
if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f;
diff --cc source/blender/editors/space_userpref/space_userpref.c
index 41c2a52,b5a6821..fea627a
--- a/source/blender/editors/space_userpref/space_userpref.c
+++ b/source/blender/editors/space_userpref/space_userpref.c
@@@ -147,23 -125,6 +147,23 @@@ static void userpref_keymap(struct wmKe
}
+static void userpref_tab_area_init(wmWindowManager *wm, ARegion *ar)
+{
+ wmKeyMap *keymap;
+
+ UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
+
+ keymap = WM_keymap_find(wm->defaultconf, "View2D Buttons List", 0, 0);
+ WM_event_add_keymap_handler(&ar->handlers, keymap);
+}
+
+static void userpref_tab_area_draw(const bContext *C, ARegion *ar)
+{
- ED_region_panels(C, ar, 1, NULL, -1);
++ ED_region_panels(C, ar, NULL, -1, true);
+
+ ar->v2d.keepofs = (V2D_LOCKOFS_Y);
+}
+
/* add handlers, stuff you only do once or on area/region changes */
static void userpref_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
{
diff --cc source/blender/makesdna/DNA_userdef_types.h
index 8ea94b8,bc2c746..00c3793
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -899,11 -887,16 +903,21 @@@ typedef enum eUserpref_VirtualPixel
VIRTUAL_PIXEL_DOUBLE = 1,
} eUserpref_VirtualPixel;
+ typedef enum eOpensubdiv_Computee_Type {
+ USER_OPENSUBDIV_COMPUTE_NONE = 0,
+ USER_OPENSUBDIV_COMPUTE_CPU = 1,
+ USER_OPENSUBDIV_COMPUTE_OPENMP = 2,
+ USER_OPENSUBDIV_COMPUTE_OPENCL = 3,
+ USER_OPENSUBDIV_COMPUTE_CUDA = 4,
+ USER_OPENSUBDIV_COMPUTE_GLSL_TRANSFORM_FEEDBACK = 5,
+ USER_OPENSUBDIV_COMPUTE_GLSL_COMPUTE = 6,
+ } eOpensubdiv_Computee_Type;
+
+typedef enum eTheme_InterfaceStyle {
+ TH_IFACE_STYLE_CLASSIC = 0,
+ TH_IFACE_STYLE_FLAT = 1,
+} eTheme_InterfaceStyle;
+
#ifdef __cplusplus
}
#endif
More information about the Bf-blender-cvs
mailing list