Changeset 1032 for trunk/modules/abstract.tcl

Timestamp:

09/11/09 06:26:45 (3 years ago)

Author:

james

Message:

support bothmixin option too

File:

• trunk/modules/abstract.tcl (modified) (3 diffs)

trunk/modules/abstract.tcl

@@ -72 +72 @@
 set BMOTION_MIXIN_REVERSE 1
 set BMOTION_MIXIN_NONE 2
+set BMOTION_MIXIN_BOTH 3
 
 if { [bMotion_setting_get "abstractMaxAge"] != "" } {
@@ -400 +401 @@
                         # mix-in the gender one with the vanilla one
                                 bMotion_putloglev 1 * "mixing in $bMotionInfo(gender) version of $abstract"
-                                set final_version $final_version [bMotion_abstract_all "${abstract}_$bMotionInfo(gender)"]]
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_$bMotionInfo(gender)"]]
                         } else {
                                 set final_version [bMotion_abstract_all $abstract]
@@ -421 +422 @@
                 2 {
                         # noop, we did it already before the switch
+                }
+                3 {
+                        if [bMotion_abstract_exists "${abstract}_male"] {
+                                bMotion_putloglev 1 * "mixing in male version of $abstract"
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_male"]]
+                        }
+                        if [bMotion_abstract_exists "${abstract}_female"] {
+                                bMotion_putloglev 1 * "mixing in female version of $abstract"
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_female"]]
+                        }
                 }
                 default {