瀏覽代碼

Fix Node.pkg merge error.

aster2013 11 年之前
父節點
當前提交
afddbaef76
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      Source/Engine/LuaScript/pkgs/Scene/Node.pkg

+ 1 - 2
Source/Engine/LuaScript/pkgs/Scene/Node.pkg

@@ -4,7 +4,6 @@ $#include "LuaScriptInstance.h"
 $#include "Node.h"
 $#include "Node.h"
 $#include "ResourceCache.h"
 $#include "ResourceCache.h"
 
 
-
 enum CreateMode
 enum CreateMode
 {
 {
     REPLICATED = 0,
     REPLICATED = 0,
@@ -18,7 +17,7 @@ enum TransformSpace
     TS_WORLD
     TS_WORLD
 };
 };
 
 
-class Node : public Serializable
+class Node : public Animatable
 {
 {
     Node();
     Node();
     virtual ~Node();
     virtual ~Node();