[Bf-blender-cvs] [3311505fd07] blender2.8: Manipulator: border editable only w/ selected camera

Campbell Barton noreply at git.blender.org
Tue Aug 15 12:52:44 CEST 2017


Commit: 3311505fd07310a6bfac79ce787dbd394002dd1f
Author: Campbell Barton
Date:   Tue Aug 15 20:53:58 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB3311505fd07310a6bfac79ce787dbd394002dd1f

Manipulator: border editable only w/ selected camera

While this isn't really needed, active border was annoying.

===================================================================

M	source/blender/editors/space_view3d/view3d_manipulator_camera.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
index 26af554f13a..10f1684b6cb 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_camera.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
@@ -301,6 +301,16 @@ static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmManipulatorGroupTy
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 
+	/* This is just so the border isn't always in the way,
+	 * stealing mouse clicks from regular usage.
+	 * We could change the rules for when to show. */
+	{
+		SceneLayer *sl = CTX_data_scene_layer(C);
+		if (scene->camera != OBACT_NEW) {
+			return false;
+		}
+	}
+
 	if (rv3d->persp == RV3D_CAMOB) {
 		if (scene->r.mode & R_BORDER) {
 			return true;




More information about the Bf-blender-cvs mailing list