|
@@ -743,6 +743,10 @@ let merge com file priority (h1,tags1) (h2,tags2) =
|
|
| TFilesAttributes _ | TEnableDebugger2 _ | TF9Scene _ -> false
|
|
| TFilesAttributes _ | TEnableDebugger2 _ | TF9Scene _ -> false
|
|
| TSetBgColor _ -> priority
|
|
| TSetBgColor _ -> priority
|
|
| TExport el when !nframe = 0 && com.flash_version >= 9 ->
|
|
| TExport el when !nframe = 0 && com.flash_version >= 9 ->
|
|
|
|
+ let el = List.filter (fun e ->
|
|
|
|
+ let path = (match List.rev (ExtString.String.nsplit e.exp_name ".") with [] -> assert false | name :: l -> List.rev l, name) in
|
|
|
|
+ List.exists (fun t -> t_path t = path) com.types
|
|
|
|
+ ) el in
|
|
classes := !classes @ List.map (fun e -> { f9_cid = Some e.exp_id; f9_classname = e.exp_name }) el;
|
|
classes := !classes @ List.map (fun e -> { f9_cid = Some e.exp_id; f9_classname = e.exp_name }) el;
|
|
false
|
|
false
|
|
| TF9Classes el when !nframe = 0 ->
|
|
| TF9Classes el when !nframe = 0 ->
|