Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / gameengine / SceneGraph / SG_Controller.h
index d65a2f0c2564f69b3551d8c7cee94e7611e2c13b..c32885b915f2d82c3b4d200afe9cd104108cd22f 100644 (file)
@@ -101,7 +101,9 @@ public:
        enum SG_Controller_option {
                SG_CONTR_NODEF = 0,
                SG_CONTR_IPO_IPO_AS_FORCE,
-               SG_CONTR_IPO_FORCES_ACT_LOCAL,
+               SG_CONTR_IPO_IPO_ADD,
+               SG_CONTR_IPO_LOCAL,
+               SG_CONTR_IPO_RESET,
                SG_CONTR_CAMIPO_LENS,
                SG_CONTR_CAMIPO_CLIPEND,
                SG_CONTR_CAMIPO_CLIPSTART,