Keying Set Fixes:
authorJoshua Leung <aligorith@gmail.com>
Tue, 16 Mar 2010 10:18:19 +0000 (10:18 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 16 Mar 2010 10:18:19 +0000 (10:18 +0000)
* 'Export Keying Set' operator works again - a change in the previous commit broke the created code
* Relative Keying Sets don't get their paths shown
* Keying Set paths show options for inserting keyframes too now

---

Another attempt at fixing compile troubles, and removed some commented out + obsolete stuff.

release/scripts/ui/properties_scene.py
source/blender/python/intern/bpy_driver.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp

index 0209140ef4eb9d37738d821d009d5e2e65ece915..7cdb42b832b402bb8adaf45230617be68a0b00cc 100644 (file)
@@ -120,7 +120,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel):
     bl_label = "Active Keying Set"
 
     def poll(self, context):
     bl_label = "Active Keying Set"
 
     def poll(self, context):
-        return (context.scene.active_keying_set is not None)
+        return (context.scene.active_keying_set and context.scene.active_keying_set.absolute);
 
     def draw(self, context):
         layout = self.layout
 
     def draw(self, context):
         layout = self.layout
@@ -163,6 +163,11 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel):
             col.prop(ksp, "grouping")
             if ksp.grouping == 'NAMED':
                 col.prop(ksp, "group")
             col.prop(ksp, "grouping")
             if ksp.grouping == 'NAMED':
                 col.prop(ksp, "group")
+                
+            col.label(text="Keyframing Settings:")
+            col.prop(ksp, "insertkey_needed", text="Needed")
+            col.prop(ksp, "insertkey_visual", text="Visual")
+            col.prop(ksp, "insertkey_xyz_to_rgb", text="XYZ to RGB")
 
 
 class SCENE_PT_physics(SceneButtonsPanel):
 
 
 class SCENE_PT_physics(SceneButtonsPanel):
@@ -295,7 +300,7 @@ class ANIM_OT_keying_set_export(bpy.types.Operator):
         # write paths
         f.write("# Path Definitions\n")
         for ksp in ks.paths:
         # write paths
         f.write("# Path Definitions\n")
         for ksp in ks.paths:
-            f.write("ksp = ks.add_destination(")
+            f.write("ksp = ks.add_path(")
 
             # id-block + RNA-path
             if ksp.id:
 
             # id-block + RNA-path
             if ksp.id:
index 39b2bbf8536e80b987f77ff3670dd7c87518ea44..b9d42f053c9e6804107e0114d864da2d46c27d41 100644 (file)
@@ -158,9 +158,6 @@ float BPY_pydriver_eval (ChannelDriver *driver)
        short targets_ok= 1;
        int i;
 
        short targets_ok= 1;
        int i;
 
-       /* sanity checks - should driver be executed? */
-       /*if (G.f & G_SCRIPT_AUTOEXEC)==0) return result; */
-
        /* get the py expression to be evaluated */
        expr = driver->expression;
        if ((expr == NULL) || (expr[0]=='\0'))
        /* get the py expression to be evaluated */
        expr = driver->expression;
        if ((expr == NULL) || (expr[0]=='\0'))
index 3ee4248343cc20c1a55411f45a543fe1cd1acb16..3a5bb92b4fa2059fdde12b708aec31df93a820a9 100644 (file)
@@ -80,17 +80,14 @@ extern "C"
 #include "DNA_material_types.h"
 #include "BLI_blenlib.h"
 #include "MEM_guardedalloc.h"
 #include "DNA_material_types.h"
 #include "BLI_blenlib.h"
 #include "MEM_guardedalloc.h"
-//XXX #include "BSE_editipo.h"
-//XXX #include "BSE_editipo_types.h"
-// #include "DNA_ipo_types.h"
 #include "BKE_global.h"
 #include "BKE_animsys.h"
 #include "BKE_library.h"
 #include "BKE_global.h"
 #include "BKE_animsys.h"
 #include "BKE_library.h"
-#include "BKE_ipo.h" // eval_icu
 #include "BKE_material.h" // copy_material
 #include "BKE_mesh.h" // copy_mesh
 #include "DNA_space_types.h"
 #include "DNA_anim_types.h"
 #include "BKE_material.h" // copy_material
 #include "BKE_mesh.h" // copy_mesh
 #include "DNA_space_types.h"
 #include "DNA_anim_types.h"
+#include "RNA_define.h"
 #include "../../blender/editors/include/ED_keyframing.h"
 }
 
 #include "../../blender/editors/include/ED_keyframing.h"
 }