Merge pull request #32721 from groud/independant_grid_snap

editor/plugins/canvas_item_editor_plugin.h

@@ -259,13 +259,14 @@ private:
 
 	float snap_rotation_step;
 	float snap_rotation_offset;
-	bool snap_active;
+	bool smart_snap_active;
+	bool grid_snap_active;
+
 	bool snap_node_parent;
 	bool snap_node_anchors;
 	bool snap_node_sides;
 	bool snap_node_center;
 	bool snap_other_nodes;
-	bool snap_grid;
 	bool snap_guides;
 	bool snap_rotation;
 	bool snap_relative;
@@ -347,7 +348,8 @@ private:
 
 	ToolButton *ruler_button;
 
-	ToolButton *snap_button;
+	ToolButton *smart_snap_button;
+	ToolButton *grid_snap_button;
 	MenuButton *snap_config_menu;
 	PopupMenu *smartsnap_config_popup;
 
@@ -529,7 +531,8 @@ private:
 	void _button_zoom_minus();
 	void _button_zoom_reset();
 	void _button_zoom_plus();
-	void _button_toggle_snap(bool p_status);
+	void _button_toggle_smart_snap(bool p_status);
+	void _button_toggle_grid_snap(bool p_status);
 	void _button_tool_select(int p_index);
 
 	HSplitContainer *palette_split;