Merge branch 'master' into alt_drag_anchor_point

Author: Keavon

demo-artwork/changing-seasons.graphite

@@ -56,52 +56,52 @@ pub fn commit_info_localized(localized_commit_date: &str) -> String {
 	)
 }
 
-#[cfg(test)]
-mod test {
-	use crate::messages::input_mapper::utility_types::input_mouse::ViewportBounds;
-	use crate::messages::prelude::*;
-
-	// TODO: Fix and reenable
-	#[ignore]
-	#[test]
-	fn debug_ub() {
-		use super::Message;
-
-		let mut editor = super::Editor::new();
-		let mut responses = Vec::new();
-
-		let messages: Vec<Message> = vec![
-			Message::Init,
-			Message::Preferences(PreferencesMessage::Load {
-				preferences: r#"{ "imaginate_server_hostname": "http://localhost:7860/", "imaginate_refresh_frequency": 1, "zoom_with_scroll": false }"#.to_string(),
-			}),
-			PortfolioMessage::OpenDocumentFileWithId {
-				document_id: DocumentId(0),
-				document_name: "".into(),
-				document_is_auto_saved: true,
-				document_is_saved: true,
-				document_serialized_content: r#" [removed until test is reenabled] "#.into(),
-				to_front: false,
-			}
-			.into(),
-			InputPreprocessorMessage::BoundsOfViewports {
-				bounds_of_viewports: vec![ViewportBounds::from_slice(&[0., 0., 1920., 1080.])],
-			}
-			.into(),
-		];
-
-		use futures::executor::block_on;
-		for message in messages {
-			block_on(crate::node_graph_executor::run_node_graph());
-			let mut res = VecDeque::new();
-			editor.poll_node_graph_evaluation(&mut res).expect("poll_node_graph_evaluation failed");
-
-			let res = editor.handle_message(message);
-			responses.push(res);
-		}
-		let responses = responses.pop().unwrap();
-		// let trigger_message = responses[responses.len() - 2].clone();
-
-		println!("responses: {responses:#?}");
-	}
-}
+// #[cfg(test)]
+// mod test {
+// 	use crate::messages::input_mapper::utility_types::input_mouse::ViewportBounds;
+// 	use crate::messages::prelude::*;
+
+// 	// TODO: Fix and reenable
+// 	#[ignore]
+// 	#[test]
+// 	fn debug_ub() {
+// 		use super::Message;
+
+// 		let mut editor = super::Editor::new();
+// 		let mut responses = Vec::new();
+
+// 		let messages: Vec<Message> = vec![
+// 			Message::Init,
+// 			Message::Preferences(PreferencesMessage::Load {
+// 				preferences: r#"{ "imaginate_server_hostname": "http://localhost:7860/", "imaginate_refresh_frequency": 1, "zoom_with_scroll": false }"#.to_string(),
+// 			}),
+// 			PortfolioMessage::OpenDocumentFileWithId {
+// 				document_id: DocumentId(0),
+// 				document_name: "".into(),
+// 				document_is_auto_saved: true,
+// 				document_is_saved: true,
+// 				document_serialized_content: r#" [removed until test is reenabled] "#.into(),
+// 				to_front: false,
+// 			}
+// 			.into(),
+// 			InputPreprocessorMessage::BoundsOfViewports {
+// 				bounds_of_viewports: vec![ViewportBounds::from_slice(&[0., 0., 1920., 1080.])],
+// 			}
+// 			.into(),
+// 		];
+
+// 		use futures::executor::block_on;
+// 		for message in messages {
+// 			block_on(crate::node_graph_executor::run_node_graph());
+// 			let mut res = VecDeque::new();
+// 			editor.poll_node_graph_evaluation(&mut res).expect("poll_node_graph_evaluation failed");
+
+// 			let res = editor.handle_message(message);
+// 			responses.push(res);
+// 		}
+// 		let responses = responses.pop().unwrap();
+// 		// let trigger_message = responses[responses.len() - 2].clone();
+
+// 		println!("responses: {responses:#?}");
+// 	}
+// }

demo-artwork/isometric-fountain.graphite

@@ -233,6 +233,7 @@ impl Dispatcher {
 					let preferences = &self.message_handlers.preferences_message_handler;
 					let current_tool = &self.message_handlers.tool_message_handler.tool_state.tool_data.active_tool_type;
 					let message_logging_verbosity = self.message_handlers.debug_message_handler.message_logging_verbosity;
+					let reset_node_definitions_on_open = self.message_handlers.portfolio_message_handler.reset_node_definitions_on_open;
 					let timing_information = self.message_handlers.animation_message_handler.timing_information();
 					let animation = &self.message_handlers.animation_message_handler;
 
@@ -244,6 +245,7 @@ impl Dispatcher {
 							preferences,
 							current_tool,
 							message_logging_verbosity,
+							reset_node_definitions_on_open,
 							timing_information,
 							animation,
 						},