1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py b/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
index 9fcaa8be3f8..90b8f021d01 100755
--- a/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
+++ b/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
@@ -9,7 +9,7 @@ Example usage:
 def main():
 	
 	def work_line_id(line):
-		return line[2], line[3] # class/from
+		return line[2].split("|")[-1], line[3] # class/from
 	
 	
 	if not (sys.argv[-1].endswith(".py") and sys.argv[-2].endswith(".py")):
@@ -31,6 +31,12 @@ def main():
 		except:
 			# print("not found", key)
 			val = val_orig
+			
+		# always take the class from the base
+		val = list(val)
+		val[2] = val_orig[2]
+		print(val_orig[2])
+		val = tuple(val)
 
 		rna_api_new.append(val)
 	
@@ -53,4 +59,4 @@ def main():
 		print("Warning '%s' contains lost %d items from module %s.py" % (file_path, len(mod_from_dict), mod_from.__name__))
 
 if __name__ == "__main__":
-	main()
-\ No newline at end of file
+	main()