From 16bf4bbcf20e3da7d5557b8c3d20c2bc50d5fb20 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 13 Dec 2013 22:07:42 +0100 Subject: [PATCH] Fixed SceneNode::operator= Former-commit-id: 9c48148eeaeeadbea708dae3d8d30c594cf5a39f --- src/Nazara/Graphics/SceneNode.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Nazara/Graphics/SceneNode.cpp b/src/Nazara/Graphics/SceneNode.cpp index 1ba6a9651..e10e9b8ce 100644 --- a/src/Nazara/Graphics/SceneNode.cpp +++ b/src/Nazara/Graphics/SceneNode.cpp @@ -15,8 +15,7 @@ m_visible(false) } NzSceneNode::NzSceneNode(const NzSceneNode& sceneNode) : -NzNode(sceneNode), -m_scene(sceneNode.m_scene), +NzNode(sceneNode), // La scène est affectée via le parenting du node m_drawingEnabled(sceneNode.m_drawingEnabled), m_visible(false) { @@ -51,8 +50,10 @@ bool NzSceneNode::IsVisible() const NzSceneNode& NzSceneNode::operator=(const NzSceneNode& sceneNode) { + NzNode::operator=(sceneNode); + + // La scène est affectée via le parenting du node m_drawingEnabled = sceneNode.m_drawingEnabled; - m_scene = sceneNode.m_scene; m_visible = false; return *this; @@ -60,8 +61,10 @@ NzSceneNode& NzSceneNode::operator=(const NzSceneNode& sceneNode) NzSceneNode& NzSceneNode::operator=(NzSceneNode&& sceneNode) { + NzNode::operator=(sceneNode); + + // La scène est affectée via le parenting du node m_drawingEnabled = sceneNode.m_drawingEnabled; - m_scene = sceneNode.m_scene; m_visible = sceneNode.m_visible; return *this;