sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Keying Set Fixes:

Browse Source 
* '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.
This commit is contained in:
Joshua Leung 2010-03-16 10:18:19 +00:00
parent f1c049137e
commit 1cf95d2494
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/scripts/ui/properties_scene.py
View File

@ -120,7 +120,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel):
bl_label = "Active Keying Set" bl_label = "Active Keying Set"
def poll(self, context): 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): def draw(self, context):
layout = self.layout layout = self.layout
@ -163,6 +163,11 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel):
col.prop(ksp, "grouping") col.prop(ksp, "grouping")
if ksp.grouping == 'NAMED': if ksp.grouping == 'NAMED':
col.prop(ksp, "group") 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 # write paths
f.write("# Path Definitions\n") f.write("# Path Definitions\n")
for ksp in ks.paths: for ksp in ks.paths:
f.write("ksp = ks.add_destination(") f.write("ksp = ks.add_path(")
# id-block + RNA-path # id-block + RNA-path
if ksp.id: if ksp.id:

3
source/blender/python/intern/bpy_driver.c
View File

@ -158,9 +158,6 @@ float BPY_pydriver_eval (ChannelDriver *driver)
short targets_ok= 1; short targets_ok= 1;
int i; int i;
/* sanity checks - should driver be executed? */
/*if (G.f & G_SCRIPT_AUTOEXEC)==0) return result; */
/* get the py expression to be evaluated */ /* get the py expression to be evaluated */
expr = driver->expression; expr = driver->expression;
if ((expr == NULL) || (expr[0]=='\0')) if ((expr == NULL) || (expr[0]=='\0'))

5
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@ -80,17 +80,14 @@ extern "C"
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "MEM_guardedalloc.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_global.h"
#include "BKE_animsys.h" #include "BKE_animsys.h"
#include "BKE_library.h" #include "BKE_library.h"
#include "BKE_ipo.h" // eval_icu
#include "BKE_material.h" // copy_material #include "BKE_material.h" // copy_material
#include "BKE_mesh.h" // copy_mesh #include "BKE_mesh.h" // copy_mesh
#include "DNA_space_types.h" #include "DNA_space_types.h"
#include "DNA_anim_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"
} }