merge own commits into render branch into trunk since 27560

27562, 27570, 27571, 27574, 27576, 27577, 27579, 27590, 27591, 27594, 27595, 27596, 27599, 27605, 27611, 27612, 27613, 27614, 27623

15 files changed, 68 insertions, 83 deletions

diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index b4666923a03..5d9531e6b37 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -545,7 +545,7 @@ static void applyarmature_fix_boneparents (Scene *scene, Object *armob)
 			/* apply current transform from parent (not yet destroyed), 
 			 * then calculate new parent inverse matrix
 			 */
-			ED_object_apply_obmat(ob);
+			object_apply_mat4(ob, ob->obmat);
 			
 			what_does_parent(scene, ob, &workob);
 			invert_m4_m4(ob->parentinv, workob.obmat);
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index de4f426eb65..dfc76aff3dd 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -929,9 +929,9 @@ static void adduplicateflagNurb(Object *obedit, short flag)
 						bezt1++;
 					}
 
-					if(nu->flagu & CU_CYCLIC) {
+					if(nu->flagu & CU_NURB_CYCLIC) {
 						if(starta!=0 || enda!=nu->pntsu-1) {
-							newnu->flagu &= ~CU_CYCLIC;
+							newnu->flagu &= ~CU_NURB_CYCLIC;
 						}
 					}
 				}
@@ -966,9 +966,9 @@ static void adduplicateflagNurb(Object *obedit, short flag)
 						bp1++;
 					}
 
-					if(nu->flagu & CU_CYCLIC) {
+					if(nu->flagu & CU_NURB_CYCLIC) {
 						if(starta!=0 || enda!=nu->pntsu-1) {
-							newnu->flagu &= ~CU_CYCLIC;
+							newnu->flagu &= ~CU_NURB_CYCLIC;
 						}
 					}
 
@@ -1904,7 +1904,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
            newly created. Old points are discarded.
         */
 			/* count */
-			if(nu->flagu & CU_CYCLIC) {
+			if(nu->flagu & CU_NURB_CYCLIC) {
 				a= nu->pntsu;
 				bezt= nu->bezt;
 				prevbezt= bezt+(a-1);
@@ -1925,7 +1925,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 				beztnew =
 					(BezTriple*)MEM_mallocN((amount + nu->pntsu) * sizeof(BezTriple), "subdivNurb");
 				beztn= beztnew;
-				if(nu->flagu & CU_CYCLIC) {
+				if(nu->flagu & CU_NURB_CYCLIC) {
 					a= nu->pntsu;
 					bezt= nu->bezt;
 					prevbezt= bezt+(a-1);
@@ -1957,7 +1957,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 						mid_v3_v3v3(beztn->vec[1], vec+9, vec+12);
 						VECCOPY(beztn->vec[2], vec+12);
 						/* handle of next bezt */
-						if(a==0 && (nu->flagu & CU_CYCLIC)) {VECCOPY(beztnew->vec[0], vec+6);}
+						if(a==0 && (nu->flagu & CU_NURB_CYCLIC)) {VECCOPY(beztnew->vec[0], vec+6);}
 						else {VECCOPY(bezt->vec[0], vec+6);}
 						
 						beztn->radius = (prevbezt->radius + bezt->radius)/2.0f;
@@ -1970,7 +1970,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 					bezt++;
 				}
 				/* last point */
-				if((nu->flagu & CU_CYCLIC)==0) memcpy(beztn, prevbezt, sizeof(BezTriple));
+				if((nu->flagu & CU_NURB_CYCLIC)==0) memcpy(beztn, prevbezt, sizeof(BezTriple));
 
 				MEM_freeN(nu->bezt);
 				nu->bezt= beztnew;
@@ -1987,7 +1987,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
            stable... nzc 30-5-'00
          */
 			/* count */
-			if(nu->flagu & CU_CYCLIC) {
+			if(nu->flagu & CU_NURB_CYCLIC) {
 				a= nu->pntsu;
 				bp= nu->bp;
 				prevbp= bp+(a-1);
@@ -2009,7 +2009,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 					(BPoint*)MEM_mallocN((amount + nu->pntsu) * sizeof(BPoint), "subdivNurb2");
 				bpn= bpnew;
 
-				if(nu->flagu & CU_CYCLIC) {
+				if(nu->flagu & CU_NURB_CYCLIC) {
 					a= nu->pntsu;
 					bp= nu->bp;
 					prevbp= bp+(a-1);
@@ -2036,7 +2036,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 					prevbp= bp;
 					bp++;
 				}
-				if((nu->flagu & CU_CYCLIC)==0) memcpy(bpn, prevbp, sizeof(BPoint));	/* last point */
+				if((nu->flagu & CU_NURB_CYCLIC)==0) memcpy(bpn, prevbp, sizeof(BPoint));	/* last point */
 
 				MEM_freeN(nu->bp);
 				nu->bp= bpnew;
@@ -2423,8 +2423,8 @@ static int convertspline(short type, Nurb *nu)
 		else if(type==CU_NURBS) {
 			nu->type = CU_NURBS;
 			nu->orderu= 4;
-			nu->flagu &= CU_CYCLIC; /* disable all flags except for cyclic */
-			nu->flagu += 4;
+			nu->flagu &= CU_NURB_CYCLIC; /* disable all flags except for cyclic */
+			nu->flagu |= CU_NURB_BEZIER;
 			makeknots(nu, 1);
 			a= nu->pntsu*nu->pntsv;
 			bp= nu->bp;
@@ -2473,11 +2473,11 @@ static int convertspline(short type, Nurb *nu)
 			nu->orderu= 4;
 			nu->orderv= 1;
 			nu->type = type;
-			if(nu->flagu & CU_CYCLIC) c= nu->orderu-1; 
+			if(nu->flagu & CU_NURB_CYCLIC) c= nu->orderu-1; 
 			else c= 0;
 			if(type== CU_NURBS) {
-				nu->flagu &= CU_CYCLIC; /* disable all flags except for cyclic */
-				nu->flagu += 4;
+				nu->flagu &= CU_NURB_CYCLIC; /* disable all flags except for cyclic */
+				nu->flagu |= CU_NURB_BEZIER;
 				makeknots(nu, 1);
 			}
 		}
@@ -2992,7 +2992,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
 	
 	/* find both nurbs and points, nu1 will be put behind nu2 */
 	for(nu= editnurb->first; nu; nu= nu->next) {
-		if((nu->flagu & CU_CYCLIC)==0) {    /* not cyclic */
+		if((nu->flagu & CU_NURB_CYCLIC)==0) {    /* not cyclic */
 			if(nu->type == CU_BEZIER) {
 				bezt= nu->bezt;
 				if(nu1==0) {
@@ -3284,7 +3284,7 @@ static int spin_nurb(bContext *C, Scene *scene, Object *obedit, float *dvec, flo
 		for(nu= editnurb->first; nu; nu= nu->next) {
 			if(isNurbsel(nu)) {
 				nu->orderv= 4;
-				nu->flagv |= CU_CYCLIC;
+				nu->flagv |= CU_NURB_CYCLIC;
 				makeknots(nu, 2);
 			}
 		}
@@ -3587,7 +3587,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 				bp= nu->bp;
 				while(a--) {
 					if( bp->f1 & SELECT ) {
-						nu->flagu ^= CU_CYCLIC;
+						nu->flagu ^= CU_NURB_CYCLIC;
 						break;
 					}
 					bp++;
@@ -3598,7 +3598,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 				bezt= nu->bezt;
 				while(a--) {
 					if( BEZSELECTED_HIDDENHANDLES(cu, bezt) ) {
-						nu->flagu ^= CU_CYCLIC;
+						nu->flagu ^= CU_NURB_CYCLIC;
 						break;
 					}
 					bezt++;
@@ -3611,7 +3611,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 					bp= nu->bp;
 					while(a--) {
 						if( bp->f1 & SELECT ) {
-							nu->flagu ^= CU_CYCLIC;
+							nu->flagu ^= CU_NURB_CYCLIC;
 							makeknots(nu, 1);	/* 1==u  type is ignored for cyclic curves */
 							break;
 						}
@@ -3626,11 +3626,11 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
 	
 					if( bp->f1 & SELECT) {
 						if(direction==0 && nu->pntsu>1) {
-							nu->flagu ^= CU_CYCLIC;
+							nu->flagu ^= CU_NURB_CYCLIC;
 							makeknots(nu, 1);   /* 1==u  type is ignored for cyclic curves */
 						}
 						if(direction==1 && nu->pntsv>1) {
-							nu->flagv ^= CU_CYCLIC;
+							nu->flagv ^= CU_NURB_CYCLIC;
 							makeknots(nu, 2);   /* 2==v  type is ignored for cyclic curves */
 						}
 						break;
@@ -4430,10 +4430,10 @@ static int delete_exec(bContext *C, wmOperator *op)
 						bezt2= bezt+1;
 						if( (bezt2->f1 & SELECT) || (bezt2->f2 & SELECT) || (bezt2->f3 & SELECT) ) ;
 						else {	/* maybe do not make cyclic */
-							if(a==0 && (nu->flagu & CU_CYCLIC) ) {
+							if(a==0 && (nu->flagu & CU_NURB_CYCLIC) ) {
 								bezt2= bezt+(nu->pntsu-1);
 								if( (bezt2->f1 & SELECT) || (bezt2->f2 & SELECT) || (bezt2->f3 & SELECT) ) {
-									nu->flagu &= ~CU_CYCLIC;
+									nu->flagu &= ~CU_NURB_CYCLIC;
 									WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 									DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 								}
@@ -4456,10 +4456,10 @@ static int delete_exec(bContext *C, wmOperator *op)
 						bp2= bp+1;
 						if( bp2->f1 & 1 ) ;
 						else {	/* maybe do not make cyclic */
-							if(a==0 && (nu->flagu & CU_CYCLIC) ) {
+							if(a==0 && (nu->flagu & CU_NURB_CYCLIC) ) {
 								bp2= bp+(nu->pntsu-1);
 								if( bp2->f1 & SELECT ) {
-									nu->flagu &= ~CU_CYCLIC;
+									nu->flagu &= ~CU_NURB_CYCLIC;
 									WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 									DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 								}
@@ -4484,14 +4484,14 @@ static int delete_exec(bContext *C, wmOperator *op)
 					BLI_remlink(editnurb, nu);
 					freeNurb(nu); nu = NULL;
 				}
-				else if(nu1->flagu & CU_CYCLIC) {	/* cyclic */
+				else if(nu1->flagu & CU_NURB_CYCLIC) {	/* cyclic */
 					bezt =
 						(BezTriple*)MEM_mallocN((cut+1) * sizeof(BezTriple), "delNurb1");
 					memcpy(bezt, nu1->bezt,(cut+1)*sizeof(BezTriple));
 					a= nu1->pntsu-cut-1;
 					memcpy(nu1->bezt, bezt2, a*sizeof(BezTriple));
 					memcpy(nu1->bezt+a, bezt, (cut+1)*sizeof(BezTriple));
-					nu1->flagu &= ~CU_CYCLIC;
+					nu1->flagu &= ~CU_NURB_CYCLIC;
 					MEM_freeN(bezt);
 					calchandlesNurb(nu);
 				}
@@ -4526,14 +4526,14 @@ static int delete_exec(bContext *C, wmOperator *op)
 					BLI_remlink(editnurb, nu);
 					freeNurb(nu); nu= NULL;
 				}
-				else if(nu1->flagu & CU_CYCLIC) {	/* cyclic */
+				else if(nu1->flagu & CU_NURB_CYCLIC) {	/* cyclic */
 					bp =
 						(BPoint*)MEM_mallocN((cut+1) * sizeof(BPoint), "delNurb5");
 					memcpy(bp, nu1->bp,(cut+1)*sizeof(BPoint));
 					a= nu1->pntsu-cut-1;
 					memcpy(nu1->bp, bp2, a*sizeof(BPoint));
 					memcpy(nu1->bp+a, bp, (cut+1)*sizeof(BPoint));
-					nu1->flagu &= ~CU_CYCLIC;
+					nu1->flagu &= ~CU_NURB_CYCLIC;
 					MEM_freeN(bp);
 				}
 				else {			/* add new curve */
@@ -4849,7 +4849,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newname)
 		nu->pntsu= 5;
 		nu->pntsv= 1;
 		nu->orderu= 5;
-		nu->flagu= 2;	/* endpoint */
+		nu->flagu= CU_NURB_ENDPOINT;	/* endpoint */
 		nu->resolu= 8;
 		nu->bp= callocstructN(BPoint, 5, "addNurbprim3");
 
@@ -4888,7 +4888,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newname)
 			if (!force_3d) nu->flag |= CU_2D;
 			nu->pntsu= 4;
 			nu->bezt= callocstructN(BezTriple, 4, "addNurbprim1");
-			nu->flagu= CU_CYCLIC;
+			nu->flagu= CU_NURB_CYCLIC;
 			bezt= nu->bezt;
 
 			bezt->h1= bezt->h2= HD_AUTO;
@@ -4925,7 +4925,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newname)
 			nu->pntsv= 1;
 			nu->orderu= 4;
 			nu->bp= callocstructN(BPoint, 8, "addNurbprim6");
-			nu->flagu= CU_CYCLIC;
+			nu->flagu= CU_NURB_CYCLIC;
 			bp= nu->bp;
 
 			for(a=0; a<8; a++) {
@@ -5047,7 +5047,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newname)
 				mul_m4_v3(mat,bp->vec);
 				bp++;
 			}
-			nu->flagu= 4;
+			nu->flagu= CU_NURB_BEZIER;
 			makeknots(nu, 1);
 
 			BLI_addtail(editnurb, nu); /* temporal for spin */
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 7bcfc81bf26..5c9b939aa1f 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -423,7 +423,7 @@ static void gp_stroke_to_path (bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Cur
 	nu->pntsu= gps->totpoints;
 	nu->pntsv= 1;
 	nu->orderu= gps->totpoints;
-	nu->flagu= 2;	/* endpoint */
+	nu->flagu= CU_NURB_ENDPOINT;
 	nu->resolu= 32;
 	
 	nu->bp= (BPoint *)MEM_callocN(sizeof(BPoint)*gps->totpoints, "bpoints");
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 8045f2a9130..ba80a15d050 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -62,7 +62,6 @@ void ED_base_object_activate(struct bContext *C, struct Base *base);
 
 void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base);
 
-void ED_object_apply_obmat(struct Object *ob);
 	/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */
 struct Base *ED_object_add_duplicate(struct Scene *scene, struct Base *base, int dupflag);
 
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index e29a6703bb8..e12db3674d4 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -413,6 +413,15 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 		BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), "Python: %s.%s", RNA_struct_identifier(but->rnapoin.type), RNA_property_identifier(but->rnaprop));
 		data->linedark[data->totline]= 1;
 		data->totline++;
+		
+		if(but->rnapoin.id.data) {
+			ID *id= but->rnapoin.id.data;
+			if(id->lib && id->lib->name) {
+				BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), "Library: %s", id->lib->name);
+				data->linedark[data->totline]= 1;
+				data->totline++;
+			}
+		}
 	}
 	else if (but->optype) {
 		PointerRNA *opptr;
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index b1405d1d12e..484a67b94db 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1118,7 +1118,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base)
 		ob->lay= base->lay;
 		
 		copy_m4_m4(ob->obmat, dob->mat);
-		ED_object_apply_obmat(ob);
+		object_apply_mat4(ob, ob->obmat);
 	}
 	
 	copy_object_set_idnew(C, 0);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 807fa00d806..65e8fbeeb8f 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -150,34 +150,6 @@ static int pupmenu(const char *msg) {return 0;}
 static bContext *C;
 static void error_libdata() {}
 
-/* ********************************** */
-
-/* --------------------------------- */
-
-void ED_object_apply_obmat(Object *ob)
-{
-	float mat[3][3], imat[3][3], tmat[3][3];
-	
-	/* from obmat to loc rot size */
-	
-	if(ob==NULL) return;
-	copy_m3_m4(mat, ob->obmat);
-	
-	VECCOPY(ob->loc, ob->obmat[3]);
-
-	mat3_to_eul( ob->rot,mat);
-	eul_to_mat3( tmat,ob->rot);
-
-	invert_m3_m3(imat, tmat);
-	
-	mul_m3_m3m3(tmat, imat, mat);
-	
-	ob->size[0]= tmat[0][0];
-	ob->size[1]= tmat[1][1];
-	ob->size[2]= tmat[2][2];
-	
-}
-
 /* ********* clear/set restrict view *********/
 static int object_restrictview_clear_exec(bContext *C, wmOperator *op)
 {
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index f55e7594c24..94eae2a7ab9 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -430,7 +430,7 @@ static int parent_clear_exec(bContext *C, wmOperator *op)
 		else if(type == 1) {
 			ob->parent= NULL;
 			ob->track= NULL;
-			ED_object_apply_obmat(ob);
+			object_apply_mat4(ob, ob->obmat);
 		}
 		else if(type == 2)
 			unit_m4(ob->parentinv);
@@ -572,7 +572,7 @@ static int parent_set_exec(bContext *C, wmOperator *op)
 				Object workob;
 				
 				/* apply transformation of previous parenting */
-				ED_object_apply_obmat(ob);
+				object_apply_mat4(ob, ob->obmat);
 				
 				/* set the parent (except for follow-path constraint option) */
 				if(partype != PAR_PATH_CONST)
@@ -887,7 +887,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
 		}
 		
 		if(type == 1)
-			ED_object_apply_obmat(ob);
+			object_apply_mat4(ob, ob->obmat);
 	}
 	CTX_DATA_END;
 
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index db15322bbc4..ca6feabdf80 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -392,7 +392,7 @@ static void ignore_parent_tx(Main *bmain, Scene *scene, Object *ob )
 	/* a change was made, adjust the children to compensate */
 	for(ob_child=bmain->object.first; ob_child; ob_child=ob_child->id.next) {
 		if(ob_child->parent == ob) {
-			ED_object_apply_obmat(ob_child);
+			object_apply_mat4(ob_child, ob_child->obmat);
 			what_does_parent(scene, ob_child, &workob);
 			invert_m4_m4(ob_child->parentinv, workob.obmat);
 		}
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index d7f3436713c..e29a81612fa 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -40,6 +40,7 @@
 #include "DNA_space_types.h"
 #include "DNA_world_types.h"
 
+#include "BKE_animsys.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_font.h"
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index 944a93a713f..62a325b59f4 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -379,7 +379,7 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa)
 {
 	PointerRNA strip_ptr;
 	uiLayout *layout= pa->layout;
-	uiLayout *column, *subcolumn;
+	uiLayout *column, *subcolumn, *subrow;
 	uiBlock *block;
 
 	/* check context and also validity of pointer */
@@ -398,10 +398,13 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa)
 		
 	
 	column= uiLayoutColumn(layout, 1);
-		uiItemR(column, NULL, 0, &strip_ptr, "animated_time", 0);
-		
+		subrow= uiLayoutRow(column, 0);
+		uiItemR(subrow, NULL, 0, &strip_ptr, "animated_time", 0);
+		uiItemR(subrow, NULL, 0, &strip_ptr, "animated_time_cyclic", 0);
+
 		subcolumn= uiLayoutColumn(column, 1);
-		uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "animated_time"));
+		subrow= uiLayoutRow(subcolumn, 0);
+		uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "animated_time"));
 			uiItemR(subcolumn, NULL, 0, &strip_ptr, "strip_time", 0);
 }
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 8fedc56df67..5a495488afa 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5773,7 +5773,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			}
 			break;
 		case OB_CAMERA:
-			if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+			if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0 || (rv3d->persp==RV3D_CAMOB && v3d->camera==ob)) /* special exception for active camera */
 				drawcamera(scene, v3d, rv3d, ob, flag);
 			break;
 		case OB_LATTICE:
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index b1f5e959388..79448ecf875 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2352,11 +2352,11 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	
 	/* Draw particle edit brush XXX (removed) */
 	
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 
-		if(rv3d->persp==RV3D_CAMOB) drawviewborder(scene, ar, v3d);
-		if(rv3d->rflag & RV3D_FLYMODE) drawviewborder_flymode(ar);
+	if(rv3d->persp==RV3D_CAMOB) drawviewborder(scene, ar, v3d);
+	if(rv3d->rflag & RV3D_FLYMODE) drawviewborder_flymode(ar);
 
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
 	//	if (v3d->flag2 & V3D_DISPGP)
 			draw_gpencil_3dview((bContext *)C, 0);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index f09b127bfdd..efc3c80de5f 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1353,11 +1353,12 @@ static int viewselected_exec(bContext *C, wmOperator *op) /* like a localview wi
 			for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
 				if(pchan->bone->flag & BONE_SELECTED) {
 					if(pchan->bone->layer & arm->layer) {
+						bPoseChannel *pchan_tx= pchan->custom_tx ? pchan->custom_tx : pchan;
 						ok= 1;
-						VECCOPY(vec, pchan->pose_head);
+						VECCOPY(vec, pchan_tx->pose_head);
 						mul_m4_v3(ob->obmat, vec);
 						DO_MINMAX(vec, min, max);
-						VECCOPY(vec, pchan->pose_tail);
+						VECCOPY(vec, pchan_tx->pose_tail);
 						mul_m4_v3(ob->obmat, vec);
 						DO_MINMAX(vec, min, max);
 					}
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 828d5368834..02c4a1d91ed 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -2288,12 +2288,12 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
 				break;
 
 			case FLY_MODAL_DIR_UP:
-				if (fly->speed < 0.0f) fly->speed= -fly->speed;
+				if (fly->speed > 0.0f) fly->speed= -fly->speed;
 				fly->axis= 1;
 				break;
 
 			case FLY_MODAL_DIR_DOWN:
-				if (fly->speed > 0.0f) fly->speed= -fly->speed;
+				if (fly->speed < 0.0f) fly->speed= -fly->speed;
 				fly->axis= 1;
 				break;