hide "revert" button for inheritable properties when no parent object

mrDIMAS · mrDIMAS · commit 287dd6c2528c · 2025-09-03T23:09:58.000+03:00
- having this button visible for new objects without a parent prefab is very confusing, it also did nothing so it was even more confusing
diff --git a/editor/src/asset/selection.rs b/editor/src/asset/selection.rs
@@ -153,19 +153,19 @@ impl SelectionContainer for AssetSelection {
         &self,
         _controller: &dyn SceneController,
         _scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         if let Some(resource) = self.resources.first() {
             if let Some(options) = resource.import_options.as_ref() {
                 let options = options.borrow();
-                callback(&**options as &dyn Reflect)
+                callback(&**options as &dyn Reflect, false)
             } else if let Ok(resource) =
                 block_on(self.resource_manager.request_untyped(&resource.path))
             {
                 if !self.resource_manager.is_built_in_resource(&resource) {
                     let guard = resource.0.lock();
                     if let Some(data) = guard.state.data_ref() {
-                        callback(&*data.0 as &dyn Reflect)
+                        callback(&*data.0 as &dyn Reflect, false)
                     }
                 }
             }
diff --git a/editor/src/audio/mod.rs b/editor/src/audio/mod.rs
@@ -83,7 +83,7 @@ impl SelectionContainer for AudioBusSelection {
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         let game_scene = some_or_return!(controller.downcast_ref::<GameScene>());
         let scene = &scenes[game_scene.scene];
@@ -93,7 +93,7 @@ impl SelectionContainer for AudioBusSelection {
             .first()
             .and_then(|handle| state.bus_graph_ref().try_get_bus_ref(*handle))
         {
-            (callback)(effect as &dyn Reflect);
+            (callback)(effect as &dyn Reflect, false);
         }
     }
 
diff --git a/editor/src/export/mod.rs b/editor/src/export/mod.rs
@@ -414,6 +414,7 @@ impl ExportWindow {
                             filter: Default::default(),
                             name_column_width: 150.0,
                             base_path: Default::default(),
+                            has_parent_object: false,
                         });
 
                         inspector = InspectorBuilder::new(WidgetBuilder::new())
diff --git a/editor/src/interaction/navmesh/selection.rs b/editor/src/interaction/navmesh/selection.rs
@@ -61,11 +61,12 @@ impl SelectionContainer for NavmeshSelection {
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         let game_scene = some_or_return!(controller.downcast_ref::<GameScene>());
         let scene = &scenes[game_scene.scene];
-        (callback)(scene.graph.try_get(self.navmesh_node).unwrap() as &dyn Reflect);
+        let node = scene.graph.try_get(self.navmesh_node).unwrap();
+        (callback)(node as &dyn Reflect, node.has_inheritance_parent());
     }
 
     fn on_property_changed(
diff --git a/editor/src/interaction/terrain.rs b/editor/src/interaction/terrain.rs
@@ -651,6 +651,7 @@ impl BrushPanel {
             filter: Default::default(),
             name_column_width: 150.0,
             base_path: Default::default(),
+            has_parent_object: false,
         });
 
         let inspector;
diff --git a/editor/src/light.rs b/editor/src/light.rs
@@ -251,6 +251,7 @@ impl LightPanel {
                                 filter: Default::default(),
                                 name_column_width: 150.0,
                                 base_path: Default::default(),
+                                has_parent_object: false,
                             }))
                             .build(ctx);
                             inspector
diff --git a/editor/src/plugins/absm/parameter.rs b/editor/src/plugins/absm/parameter.rs
@@ -106,6 +106,7 @@ impl ParameterPanel {
                     filter: Default::default(),
                     name_column_width: 150.0,
                     base_path: Default::default(),
+                    has_parent_object: false,
                 })
             })
             .unwrap_or_default();
diff --git a/editor/src/plugins/absm/selection.rs b/editor/src/plugins/absm/selection.rs
@@ -164,21 +164,21 @@ impl<N: Reflect> SelectionContainer for AbsmSelection<N> {
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         if let Some(machine) = get_machine_ref(controller, self.absm_node_handle, scenes) {
             if let Some(first) = self.entities.first() {
                 if let Some(layer_index) = self.layer {
                     if let Some(layer) = machine.layers().get(layer_index) {
                         match first {
                             SelectedEntity::Transition(transition) => {
-                                (callback)(&layer.transitions()[*transition] as &dyn Reflect)
+                                (callback)(&layer.transitions()[*transition] as &dyn Reflect, false)
                             }
                             SelectedEntity::State(state) => {
-                                (callback)(&layer.states()[*state] as &dyn Reflect)
+                                (callback)(&layer.states()[*state] as &dyn Reflect, false)
                             }
                             SelectedEntity::PoseNode(pose) => {
-                                (callback)(&layer.nodes()[*pose] as &dyn Reflect)
+                                (callback)(&layer.nodes()[*pose] as &dyn Reflect, false)
                             }
                         };
                     }
diff --git a/editor/src/plugins/animation/selection.rs b/editor/src/plugins/animation/selection.rs
@@ -125,7 +125,7 @@ where
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         if let Some(container) = get_animations_container(self.animation_player, controller, scenes)
         {
@@ -134,7 +134,7 @@ where
                     self.entities.first()
                 {
                     if let Some(signal) = animation.signals().iter().find(|s| s.id == *id) {
-                        (callback)(signal as &dyn Reflect);
+                        (callback)(signal as &dyn Reflect, false);
                     }
                 }
             }
diff --git a/editor/src/plugins/inspector/editors/script.rs b/editor/src/plugins/inspector/editors/script.rs
@@ -244,6 +244,7 @@ impl ScriptPropertyEditorBuilder {
         script: &Option<Script>,
         definition_container: Arc<PropertyEditorDefinitionContainer>,
         name_column_width: f32,
+        has_parent_object: bool,
         ctx: &mut BuildContext,
     ) -> Handle<UiNode> {
         let context = script.as_ref().map(|script| {
@@ -258,6 +259,7 @@ impl ScriptPropertyEditorBuilder {
                 filter,
                 name_column_width,
                 base_path: Default::default(),
+                has_parent_object,
             })
         });
 
@@ -393,6 +395,7 @@ impl PropertyEditorDefinition for ScriptPropertyEditorDefinition {
                     value,
                     ctx.definition_container.clone(),
                     ctx.name_column_width,
+                    ctx.has_parent_object,
                     ctx.build_context,
                 );
                 editor
@@ -486,6 +489,7 @@ impl PropertyEditorDefinition for ScriptPropertyEditorDefinition {
                         filter: ctx.filter,
                         name_column_width: ctx.name_column_width,
                         base_path: Default::default(),
+                        has_parent_object: ctx.has_parent_object,
                     })
                 })
                 .unwrap_or_default();
diff --git a/editor/src/plugins/inspector/mod.rs b/editor/src/plugins/inspector/mod.rs
@@ -306,6 +306,7 @@ impl InspectorPlugin {
         available_animations: &[AnimationDefinition],
         sender: &MessageSender,
         icon_request_sender: Sender<IconRequest>,
+        has_parent_object: bool,
     ) {
         let environment = Arc::new(EditorEnvironment {
             resource_manager,
@@ -326,6 +327,7 @@ impl InspectorPlugin {
             filter: Default::default(),
             name_column_width: 150.0,
             base_path: Default::default(),
+            has_parent_object,
         });
 
         ui.send_message(InspectorMessage::context(
@@ -373,7 +375,7 @@ impl EditorPlugin for InspectorPlugin {
         entry.selection.first_selected_entity(
             &*entry.controller,
             &editor.engine.scenes,
-            &mut |entity| {
+            &mut |entity, has_parent_object| {
                 if let Err(errors) = self.sync_to(entity, ui) {
                     if is_out_of_sync(&errors) {
                         let available_animations = fetch_available_animations(
@@ -390,6 +392,7 @@ impl EditorPlugin for InspectorPlugin {
                             &available_animations,
                             &editor.message_sender,
                             editor.asset_browser.preview_sender.clone(),
+                            has_parent_object,
                         );
 
                         need_clear = false;
@@ -436,7 +439,7 @@ impl EditorPlugin for InspectorPlugin {
                         entry.selection.first_selected_entity(
                             &*entry.controller,
                             &editor.engine.scenes,
-                            &mut |entity| {
+                            &mut |entity, _| {
                                 entity.resolve_path(path, &mut |result| {
                                     if let Ok(result) = result {
                                         self.clipboard = result.try_clone_box();
@@ -461,7 +464,7 @@ impl EditorPlugin for InspectorPlugin {
                         entry.selection.first_selected_entity(
                             &*entry.controller,
                             &editor.engine.scenes,
-                            &mut |entity| {
+                            &mut |entity, _| {
                                 entity.resolve_path(path, &mut |result| {
                                     if let Ok(property) = result {
                                         can_copy = property.try_clone_box().is_some();
diff --git a/editor/src/plugins/ragdoll.rs b/editor/src/plugins/ragdoll.rs
@@ -1054,6 +1054,7 @@ impl RagdollWizard {
                                 filter: Default::default(),
                                 name_column_width: 150.0,
                                 base_path: Default::default(),
+                                has_parent_object: false,
                             }))
                             .build(ctx);
                             inspector
diff --git a/editor/src/plugins/settings.rs b/editor/src/plugins/settings.rs
@@ -272,6 +272,7 @@ impl SettingsWindow {
             filter: Default::default(),
             name_column_width: 150.0,
             base_path: Default::default(),
+            has_parent_object: false,
         });
         let groups =
             context
diff --git a/editor/src/scene/mod.rs b/editor/src/scene/mod.rs
@@ -1150,7 +1150,7 @@ pub trait SelectionContainer: BaseSelectionContainer {
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     );
 
     fn on_property_changed(
@@ -1286,7 +1286,7 @@ impl Selection {
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         if let Some(container) = self.0.as_ref() {
             container.first_selected_entity(controller, scenes, callback);
diff --git a/editor/src/scene/settings/mod.rs b/editor/src/scene/settings/mod.rs
@@ -180,6 +180,7 @@ impl SceneSettingsWindow {
             }),
             name_column_width: 150.0,
             base_path: Default::default(),
+            has_parent_object: false,
         });
 
         ui.send_message(InspectorMessage::context(
diff --git a/editor/src/ui_scene/selection.rs b/editor/src/ui_scene/selection.rs
@@ -52,12 +52,12 @@ impl SelectionContainer for UiSelection {
         &self,
         controller: &dyn SceneController,
         _scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         let ui_scene = some_or_return!(controller.downcast_ref::<UiScene>());
         if let Some(first) = self.widgets.first() {
-            if let Some(node) = ui_scene.ui.try_get(*first).map(|n| n as &dyn Reflect) {
-                (callback)(node)
+            if let Some(node) = ui_scene.ui.try_get(*first) {
+                (callback)(node as &dyn Reflect, node.has_inheritance_parent())
             }
         }
     }
diff --git a/editor/src/world/selection.rs b/editor/src/world/selection.rs
@@ -52,7 +52,7 @@ impl SelectionContainer for GraphSelection {
         &self,
         controller: &dyn SceneController,
         scenes: &SceneContainer,
-        callback: &mut dyn FnMut(&dyn Reflect),
+        callback: &mut dyn FnMut(&dyn Reflect, bool),
     ) {
         let game_scene = some_or_return!(controller.downcast_ref::<GameScene>());
         let scene = &scenes[game_scene.scene];
@@ -61,7 +61,7 @@ impl SelectionContainer for GraphSelection {
             .first()
             .and_then(|handle| scene.graph.try_get(*handle))
         {
-            (callback)(node as &dyn Reflect);
+            (callback)(node as &dyn Reflect, node.has_inheritance_parent());
         }
     }
 
diff --git a/fyrox-impl/src/scene/base.rs b/fyrox-impl/src/scene/base.rs
@@ -774,6 +774,13 @@ impl Base {
         self.original_handle_in_resource
     }
 
+    /// Returns `true` if the node has a parent object in a resource from which it may restore
+    /// values of its inheritable properties.
+    #[inline]
+    pub fn has_inheritance_parent(&self) -> bool {
+        self.original_handle_in_resource.is_some() && self.resource.is_some()
+    }
+
     /// Returns position of the node in absolute coordinates.
     #[inline]
     pub fn global_position(&self) -> Vector3<f32> {
diff --git a/fyrox-ui/src/inspector/editors/array.rs b/fyrox-ui/src/inspector/editors/array.rs
@@ -128,6 +128,7 @@ fn create_items<'a, 'b, T, I>(
     filter: PropertyFilter,
     name_column_width: f32,
     base_path: String,
+    has_parent_object: bool,
 ) -> Result<Vec<Item>, InspectorError>
 where
     T: Reflect,
@@ -172,6 +173,7 @@ where
                         filter: filter.clone(),
                         name_column_width,
                         base_path: format!("{base_path}[{index}]"),
+                        has_parent_object,
                     })?;
 
             if let PropertyEditorInstance::Simple { editor } = editor {
@@ -252,6 +254,7 @@ where
         sync_flag: u64,
         name_column_width: f32,
         base_path: String,
+        has_parent_object: bool,
     ) -> Result<Handle<UiNode>, InspectorError> {
         let definition_container = self
             .definition_container
@@ -271,6 +274,7 @@ where
                 self.filter,
                 name_column_width,
                 base_path,
+                has_parent_object,
             )?
         } else {
             Vec::new()
@@ -354,6 +358,7 @@ where
                     ctx.sync_flag,
                     ctx.name_column_width,
                     ctx.base_path.clone(),
+                    ctx.has_parent_object,
                 )?;
                 editor
             },
@@ -380,6 +385,7 @@ where
             environment,
             name_column_width,
             base_path,
+            has_parent_object,
         } = ctx;
 
         let instance_ref = if let Some(instance) = ui.node(instance).cast::<ArrayEditor>() {
@@ -436,6 +442,7 @@ where
                             filter: filter.clone(),
                             name_column_width,
                             base_path: format!("{base_path}[{index}]"),
+                            has_parent_object,
                         })?
                 {
                     ui.send_message(message.with_flags(ctx.sync_flag))
diff --git a/fyrox-ui/src/inspector/editors/cell.rs b/fyrox-ui/src/inspector/editors/cell.rs
@@ -114,6 +114,7 @@ where
                     filter: ctx.filter,
                     name_column_width: ctx.name_column_width,
                     base_path: ctx.base_path.clone(),
+                    has_parent_object: ctx.has_parent_object,
                 })
         } else {
             Err(InspectorError::Custom("No editor!".to_string()))
@@ -163,6 +164,7 @@ where
                     filter: ctx.filter,
                     name_column_width: ctx.name_column_width,
                     base_path: ctx.base_path.clone(),
+                    has_parent_object: ctx.has_parent_object,
                 });
         }
 
diff --git a/fyrox-ui/src/inspector/editors/collection.rs b/fyrox-ui/src/inspector/editors/collection.rs
diff --git a/fyrox-ui/src/inspector/editors/enumeration.rs b/fyrox-ui/src/inspector/editors/enumeration.rs
diff --git a/fyrox-ui/src/inspector/editors/inherit.rs b/fyrox-ui/src/inspector/editors/inherit.rs
diff --git a/fyrox-ui/src/inspector/editors/inspectable.rs b/fyrox-ui/src/inspector/editors/inspectable.rs
diff --git a/fyrox-ui/src/inspector/editors/mod.rs b/fyrox-ui/src/inspector/editors/mod.rs
diff --git a/fyrox-ui/src/inspector/editors/refcell.rs b/fyrox-ui/src/inspector/editors/refcell.rs
diff --git a/fyrox-ui/src/inspector/editors/style.rs b/fyrox-ui/src/inspector/editors/style.rs
diff --git a/fyrox-ui/src/inspector/mod.rs b/fyrox-ui/src/inspector/mod.rs
diff --git a/fyrox-ui/src/widget.rs b/fyrox-ui/src/widget.rs
diff --git a/project-manager/src/settings.rs b/project-manager/src/settings.rs

Original file line number	Diff line number	Diff line change
`@@ -153,19 +153,19 @@ impl SelectionContainer for AssetSelection {`
`153`	`153`	`&self,`
`154`	`154`	`_controller: &dyn SceneController,`
`155`	`155`	`_scenes: &SceneContainer,`
`156`		`- callback: &mut dyn FnMut(&dyn Reflect),`
	`156`	`+ callback: &mut dyn FnMut(&dyn Reflect, bool),`
`157`	`157`	`) {`
`158`	`158`	`if let Some(resource) = self.resources.first() {`
`159`	`159`	`if let Some(options) = resource.import_options.as_ref() {`
`160`	`160`	`let options = options.borrow();`
`161`		`- callback(&**options as &dyn Reflect)`
	`161`	`+ callback(&**options as &dyn Reflect, false)`
`162`	`162`	`} else if let Ok(resource) =`
`163`	`163`	`block_on(self.resource_manager.request_untyped(&resource.path))`
`164`	`164`	`{`
`165`	`165`	`if !self.resource_manager.is_built_in_resource(&resource) {`
`166`	`166`	`let guard = resource.0.lock();`
`167`	`167`	`if let Some(data) = guard.state.data_ref() {`
`168`		`- callback(&*data.0 as &dyn Reflect)`
	`168`	`+ callback(&*data.0 as &dyn Reflect, false)`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ impl SelectionContainer for AudioBusSelection {`
`83`	`83`	`&self,`
`84`	`84`	`controller: &dyn SceneController,`
`85`	`85`	`scenes: &SceneContainer,`
`86`		`- callback: &mut dyn FnMut(&dyn Reflect),`
	`86`	`+ callback: &mut dyn FnMut(&dyn Reflect, bool),`
`87`	`87`	`) {`
`88`	`88`	`let game_scene = some_or_return!(controller.downcast_ref::<GameScene>());`
`89`	`89`	`let scene = &scenes[game_scene.scene];`
`@@ -93,7 +93,7 @@ impl SelectionContainer for AudioBusSelection {`
`93`	`93`	`.first()`
`94`	`94`	`.and_then(\|handle\| state.bus_graph_ref().try_get_bus_ref(*handle))`
`95`	`95`	`{`
`96`		`- (callback)(effect as &dyn Reflect);`
	`96`	`+ (callback)(effect as &dyn Reflect, false);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ where`
`125`	`125`	`&self,`
`126`	`126`	`controller: &dyn SceneController,`
`127`	`127`	`scenes: &SceneContainer,`
`128`		`- callback: &mut dyn FnMut(&dyn Reflect),`
	`128`	`+ callback: &mut dyn FnMut(&dyn Reflect, bool),`
`129`	`129`	`) {`
`130`	`130`	`if let Some(container) = get_animations_container(self.animation_player, controller, scenes)`
`131`	`131`	`{`
`@@ -134,7 +134,7 @@ where`
`134`	`134`	`self.entities.first()`
`135`	`135`	`{`
`136`	`136`	`if let Some(signal) = animation.signals().iter().find(\|s\| s.id == *id) {`
`137`		`- (callback)(signal as &dyn Reflect);`
	`137`	`+ (callback)(signal as &dyn Reflect, false);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`