[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27532] trunk/blender: Keying Set Fixes:

Joshua Leung aligorith at gmail.com
Tue Mar 16 11:18:19 CET 2010


Revision: 27532
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27532
Author:   aligorith
Date:     2010-03-16 11:18:19 +0100 (Tue, 16 Mar 2010)

Log Message:
-----------
Keying Set Fixes:
* '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.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_scene.py
    trunk/blender/source/blender/python/intern/bpy_driver.c
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Modified: trunk/blender/release/scripts/ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_scene.py	2010-03-16 08:07:43 UTC (rev 27531)
+++ trunk/blender/release/scripts/ui/properties_scene.py	2010-03-16 10:18:19 UTC (rev 27532)
@@ -120,7 +120,7 @@
     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
@@ -163,6 +163,11 @@
             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):
@@ -295,7 +300,7 @@
         # 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:

Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c	2010-03-16 08:07:43 UTC (rev 27531)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c	2010-03-16 10:18:19 UTC (rev 27532)
@@ -158,9 +158,6 @@
 	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'))

Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2010-03-16 08:07:43 UTC (rev 27531)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2010-03-16 10:18:19 UTC (rev 27532)
@@ -80,17 +80,14 @@
 #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_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 "RNA_define.h"
 #include "../../blender/editors/include/ED_keyframing.h"
 }
 





More information about the Bf-blender-cvs mailing list