Merge conflict fix attempt

algorithms.py

@@ -1196,6 +1196,7 @@ def remove_censors():
 
     return None
 
+#Teto
 # ------------------------------------------------------------------------
 #    UI and UI init Functions
 # ------------------------------------------------------------------------
@@ -1206,10 +1207,33 @@ def remove_censors():
 # we use things like bpy.types.scene.whatever.
 # Here, the trick is to keep the list of tuples used to
 # create the component somewhere, and check in it.
-def get_enum_property_item(key, enum_property):
+def get_enum_property_item(key, enum_property, index=1):
     value = None
-    for index in range(len(enum_property)):
-        if key in enum_property[index]:
-            value = enum_property[index]
-            return value[1]
-    return ""
+    for ind in range(len(enum_property)):
+        if key in enum_property[ind]:
+            value = enum_property[ind]
+            return value[index]
+    return ""
+
+#create an enumProperty list of tuples, from a list.
+def create_enum_property_items(values=[], key_length=3, tip_length=4):
+    if values == None or len(values) < 1:
+        return [("0", "NONE", "")]
+    return_list = []
+    for i in range(len(values)):
+        return_list.append(
+            (str(i).zfill(key_length),
+            values[i],
+            str(values[i])[0:tip_length]))
+    return return_list
+
+def split_name(name, splitting_char=[], indexes=[]):
+    if len(splitting_char) < 1:
+        return name
+    if len(indexes) < 1:
+        indexes = [0]*len(splitting_char)
+    result = name
+    for i in range(len(splitting_char)):
+        result = result.split(splitting_char[i])[indexes[i]]
+    return result
+#End Teto

creation_tools_ops.py

@@ -42,7 +42,7 @@
     "male_poses", "rest_poses"]
 
 forbiden_names = ["human", "humans", "anime", "male", "female", "anthropometry", "bbox", "expressions",
-    "exprs", "morphs", "hair", "joints", "offset", "measures", "extra", "polygs", "ptypes",
+    "exprs", "Expression", "morphs", "hair", "joints", "offset", "measures", "extra", "polygs", "ptypes",
     "poses", "rest", "specialtype", "anyme", "style", "type", "base", "transf", "verts",
     "vgroups", "muscles", "none"]
 

expressionengine.py

@@ -60,9 +60,10 @@ def __init__(self):
         self.expressions_data = {}
         self.model_type = "NONE"
         self.has_data = True
+        #Teto
+        self.expression_creator = expressionscreator.ExpressionsCreator()
 
     def identify_model_type(self):
-        #Teto
         #self.model_type = "NONE"
         obj = algorithms.get_active_body()
         if obj:
@@ -79,7 +80,7 @@ def identify_model_type(self):
                         length = len(id)-4
                         tp_name = id[14:length].upper()
                         if tp_name != self.model_type:
-                            expressionscreator.reset_expressions_items()
+                            self.expression_creator.reset_expressions_items()
                         self.model_type = tp_name
                         return
         self.model_type = "NONE"