Commit: f8de442a355023285a3d69a24f48dd79be3ceeaf
Author: Campbell Barton
Date: Fri Mar 13 03:40:58 2015 +1100
Branches: master
https://developer.blender.org/rBf8de442a355023285a3d69a24f48dd79be3ceeaf
Cleanup: remove unused viewnumpad code
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 233a0bd..4043a86 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3703,22 +3703,6 @@ static void axis_set_view(bContext *C, View3D *v3d,
ARegion *ar,
}
if (align_active == false) {
- /* normal operation */
- if (rv3d->viewlock & RV3D_LOCKED) {
- /* only pass on if */
-
- /* nice confusing if-block */
- if (!((rv3d->view == RV3D_VIEW_FRONT && view ==
RV3D_VIEW_BACK) ||
- (rv3d->view == RV3D_VIEW_BACK && view ==
RV3D_VIEW_FRONT) ||
- (rv3d->view == RV3D_VIEW_RIGHT && view ==
RV3D_VIEW_LEFT) ||
- (rv3d->view == RV3D_VIEW_LEFT && view ==
RV3D_VIEW_RIGHT) ||
- (rv3d->view == RV3D_VIEW_BOTTOM && view ==
RV3D_VIEW_TOP) ||
- (rv3d->view == RV3D_VIEW_TOP && view ==
RV3D_VIEW_BOTTOM)))
- {
- return;
- }
- }
-
rv3d->view = view;
}
@@ -3765,10 +3749,6 @@ static int viewnumpad_exec(bContext *C, wmOperator *op)
viewnum = RNA_enum_get(op->ptr, "type");
align_active = RNA_boolean_get(op->ptr, "align_active");
- /* set this to zero, gets handled in axis_set_view */
- if (rv3d->viewlock & RV3D_LOCKED)
- align_active = false;
-
/* Use this to test if we started out with a camera */
if (rv3d->persp == RV3D_CAMOB) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
