Skip to content

Commit 4ef8f6f

Browse files
committed
Merge branch 'master' into mesh-gradient-poc
# Conflicts: # editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs # editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs # editor/src/messages/portfolio/document/graph_operation/utility_types.rs # editor/src/messages/portfolio/document/node_graph/node_properties.rs # editor/src/messages/portfolio/document_migration.rs # node-graph/libraries/graphic-types/src/graphic.rs # node-graph/libraries/rendering/src/render_ext.rs # node-graph/libraries/rendering/src/renderer.rs # node-graph/nodes/path-bool/src/lib.rs # node-graph/nodes/vector/src/vector_nodes.rs
2 parents 45c0ad6 + ba7cbd8 commit 4ef8f6f

58 files changed

Lines changed: 3529 additions & 2255 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

demo-artwork/changing-seasons.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/isometric-fountain.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/marbled-mandelbrot.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/painted-dreams.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/src/messages/broadcast/event/event_message.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ pub enum EventMessage {
88
CanvasTransformed,
99
ToolAbort,
1010
SelectionChanged,
11+
/// The document graph's nodes or wires changed, so state derived from the selection's chains may be stale
12+
GraphChanged,
1113
WorkingColorChanged,
1214
}

editor/src/messages/portfolio/document/data_panel/data_panel_message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ pub enum PathStep {
3737
#[derive(PartialEq, Eq, Clone, Copy, Default, Debug, serde::Serialize, serde::Deserialize)]
3838
pub enum VectorTableTab {
3939
#[default]
40-
Properties,
4140
Points,
4241
Segments,
4342
Regions,
43+
Handles,
4444
}

0 commit comments

Comments
 (0)