UI: Comment out "Clip border" operator
authorClément Foucault <foucault.clem@gmail.com>
Wed, 14 Nov 2018 10:45:29 +0000 (11:45 +0100)
committerClément Foucault <foucault.clem@gmail.com>
Wed, 14 Nov 2018 10:50:37 +0000 (11:50 +0100)
Also Remove it from the UI as it has not been ported to 2.8 and it is a
delicate thing to do.

release/scripts/presets/keyconfig/3dsmax.py
release/scripts/presets/keyconfig/keymap_data/blender_default.py
release/scripts/presets/keyconfig/maya.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_ops.c
source/blender/windowmanager/intern/wm_operators.c

index 3024a5638f26cbb22d9e169fa194df5d9912090c..206dc820f0490d5de20863853f71d1494a0cd06d 100644 (file)
@@ -655,7 +655,7 @@ kmi.properties.deselect = False
 kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', shift=True, ctrl=True)
 kmi.properties.deselect = True
 kmi = km.keymap_items.new('view3d.select_circle', 'C', 'PRESS', alt=True)
-kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True)
+kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True)
 kmi = km.keymap_items.new('view3d.zoom_border', 'B', 'PRESS', shift=True)
 kmi = km.keymap_items.new('view3d.render_border', 'B', 'PRESS', shift=True)
 kmi.properties.camera_only = True
index e501f4e91ab116b2ed866d80f1f4950194bfdeeb..0320238a6815f1b0307b2451aac7dd1e88c8e569 100644 (file)
@@ -936,7 +936,7 @@ def km_view3d(params):
          {"properties": [("mode", 'SUB')]}),
         ("view3d.select_circle", {"type": 'C', "value": 'PRESS'}, None),
         # Borders.
-        ("view3d.clip_border", {"type": 'B', "value": 'PRESS', "alt": True}, None),
+        ("view3d.clip_border", {"type": 'B', "value": 'PRESS', "alt": True}, None),
         ("view3d.zoom_border", {"type": 'B', "value": 'PRESS', "shift": True}, None),
         ("view3d.render_border", {"type": 'B', "value": 'PRESS', "ctrl": True}, None),
         ("view3d.clear_render_border", {"type": 'B', "value": 'PRESS', "ctrl": True, "alt": True}, None),
index 60e58d6324a6e367c86f36b50b8d5ca5f39eb535..1ce2fb34ccfe11d636d512fea2e104242fc6fce7 100644 (file)
@@ -1058,7 +1058,7 @@ kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_M', 'ANY', ctrl=True
 kmi.properties.deselect = True
 kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_M', 'ANY', any=True)
 kmi = km.keymap_items.new('view3d.select_circle', 'Q', 'PRESS', shift=True)
-kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True)
+kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True)
 kmi = km.keymap_items.new('view3d.zoom_border', 'B', 'PRESS', shift=True)
 kmi = km.keymap_items.new('wm.call_menu', 'S', 'PRESS', shift=True, ctrl=True)
 kmi.properties.name = 'VIEW3D_MT_snap'
index ae360788a36358bc73a2913dfc50709775629d06..095f1e73eac870dc86c2bce65665e7d12a52da77 100644 (file)
@@ -763,7 +763,7 @@ class VIEW3D_MT_view_borders(Menu):
 
     def draw(self, context):
         layout = self.layout
-        layout.operator("view3d.clip_border", text="Clipping Border...")
+        layout.operator("view3d.clip_border", text="Clipping Border...")
         layout.operator("view3d.render_border", text="Render Border...")
 
         layout.separator()
index 7f102189121be274bc90f5351edad3f638b5d610..dea28b75745ad8ac681c8dcab41a6e51b40515e0 100644 (file)
@@ -4550,6 +4550,8 @@ void ED_view3d_clipping_local(RegionView3D *rv3d, float mat[4][4])
                calc_local_clipping(rv3d->clip_local, rv3d->clipbb, mat);
 }
 
+#if 0 /* TODO Missing from 2.8 drawing code. Find a solution to support clip border then uncomment it. */
+
 static int view3d_clipping_exec(bContext *C, wmOperator *op)
 {
        ARegion *ar = CTX_wm_region(C);
@@ -4606,6 +4608,7 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot)
        /* properties */
        WM_operator_properties_border(ot);
 }
+#endif
 
 /** \} */
 
index b3e779270247327610c990d103ad90d9ed96bcd2..8c21497dd538361d928b5a4f7113df931d15be24 100644 (file)
@@ -98,7 +98,7 @@ void VIEW3D_OT_background_image_add(struct wmOperatorType *ot);
 void VIEW3D_OT_background_image_remove(struct wmOperatorType *ot);
 void VIEW3D_OT_view_orbit(struct wmOperatorType *ot);
 void VIEW3D_OT_view_roll(struct wmOperatorType *ot);
-void VIEW3D_OT_clip_border(struct wmOperatorType *ot);
+// void VIEW3D_OT_clip_border(struct wmOperatorType *ot);
 void VIEW3D_OT_cursor3d(struct wmOperatorType *ot);
 void VIEW3D_OT_render_border(struct wmOperatorType *ot);
 void VIEW3D_OT_clear_render_border(struct wmOperatorType *ot);
index 6c56bd7e72bdff598a4783336ada0a9f9945a626..0c916ebf2a332f7342cc598240eff9b579abccdd 100644 (file)
@@ -192,7 +192,7 @@ void view3d_operatortypes(void)
        WM_operatortype_append(VIEW3D_OT_view_center_lock);
        WM_operatortype_append(VIEW3D_OT_select);
        WM_operatortype_append(VIEW3D_OT_select_box);
-       WM_operatortype_append(VIEW3D_OT_clip_border);
+       // WM_operatortype_append(VIEW3D_OT_clip_border);
        WM_operatortype_append(VIEW3D_OT_select_circle);
        WM_operatortype_append(VIEW3D_OT_smoothview);
        WM_operatortype_append(VIEW3D_OT_render_border);
index 56171167b99191b281bef39f00ea921db2c6b4b2..1bb79755e4656c5ebbf8819b114856dd3ac6cbef 100644 (file)
@@ -3288,7 +3288,7 @@ static void gesture_box_modal_keymap(wmKeyConfig *keyconf)
        WM_modalkeymap_assign(keymap, "CLIP_OT_graph_select_box");
        WM_modalkeymap_assign(keymap, "MASK_OT_select_box");
        WM_modalkeymap_assign(keymap, "VIEW2D_OT_zoom_border");
-       WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border");
+//     WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border"); /* TODO */
        WM_modalkeymap_assign(keymap, "VIEW3D_OT_render_border");
        WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_box");
        WM_modalkeymap_assign(keymap, "VIEW3D_OT_zoom_border"); /* XXX TODO: zoom border should perhaps map rightmouse to zoom out instead of in+cancel */