diff --git a/source/blender/src/mywindow.c b/source/blender/src/mywindow.c index ab7697e2fc5..070e2b0ce34 100644 --- a/source/blender/src/mywindow.c +++ b/source/blender/src/mywindow.c @@ -107,6 +107,8 @@ void mywindow_init_mainwin(Window *win, int orx, int ory, int sizex, int sizey) glGetIntegerv(GL_BLUE_BITS, &b); mainwin_color_depth= r + g + b; + + if(G.f & G_DEBUG) printf("Color depth R=%d G=%d B=%d\n", (int)r, (int)g, (int)b); } /* XXXXXXXXXXXXXXXX very hacky, not allowed to release diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 655b7b61c32..7a5359f9422 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1205,14 +1205,14 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) case PKEY: if(G.obedit) { - if(G.qual==LR_CTRLKEY) + if(G.qual==LR_CTRLKEY || G.qual==(LR_SHIFTKEY|LR_CTRLKEY)) make_parent(); else if((G.qual==0) && G.obedit->type==OB_MESH) separatemenu(); else if ((G.qual==0) && ELEM(G.obedit->type, OB_CURVE, OB_SURF)) separate_nurb(); } - else if(G.qual==LR_CTRLKEY) + else if(G.qual==LR_CTRLKEY || G.qual==(LR_SHIFTKEY|LR_CTRLKEY)) make_parent(); else if(G.qual==LR_ALTKEY) clear_parent();