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

Visual Keyframing now works for rigid body objects too

Browse Source
This commit is contained in:
Joshua Leung 2013-01-28 01:02:14 +00:00
parent 5a0e2b58c8
commit f64124cb78
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/animation/keyframing.c
View File

@ -52,6 +52,7 @@
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_rigidbody_types.h"
#include "BKE_animsys.h" #include "BKE_animsys.h"
#include "BKE_action.h" #include "BKE_action.h"
@ -554,6 +555,7 @@ static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
{ {
bConstraint *con = NULL; bConstraint *con = NULL;
short searchtype = VISUALKEY_NONE; short searchtype = VISUALKEY_NONE;
short has_rigidbody = FALSE;
short has_parent = FALSE; short has_parent = FALSE;
const char *identifier = NULL; const char *identifier = NULL;
@ -569,10 +571,14 @@ static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
if (ptr->type == &RNA_Object) { if (ptr->type == &RNA_Object) {
/* Object */ /* Object */
Object *ob = (Object *)ptr->data; Object *ob = (Object *)ptr->data;
RigidBodyOb *rbo = ob->rigidbody_object;
con = ob->constraints.first; con = ob->constraints.first;
identifier = RNA_property_identifier(prop); identifier = RNA_property_identifier(prop);
has_parent = (ob->parent != NULL); has_parent = (ob->parent != NULL);
/* active rigidbody objects only, as only those are affected by sim */
has_rigidbody = ((rbo) && (rbo->type == RBO_TYPE_ACTIVE));
} }
else if (ptr->type == &RNA_PoseBone) { else if (ptr->type == &RNA_PoseBone) {
/* Pose Channel */ /* Pose Channel */
@ -584,7 +590,7 @@ static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
} }
/* check if any data to search using */ /* check if any data to search using */
if (ELEM(NULL, con, identifier) && (has_parent == FALSE)) if (ELEM(NULL, con, identifier) && (has_parent == FALSE) && (has_rigidbody == FALSE))
return 0; return 0;
/* location or rotation identifiers only... */ /* location or rotation identifiers only... */
@ -609,8 +615,8 @@ static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
/* only search if a searchtype and initial constraint are available */ /* only search if a searchtype and initial constraint are available */
if (searchtype) { if (searchtype) {
/* parent is always matching */ /* parent or rigidbody are always matching */
if (has_parent) if (has_parent || has_rigidbody)
return 1; return 1;
/* constraints */ /* constraints */
@ -696,12 +702,12 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i
*/ */
if (ptr->type == &RNA_Object) { if (ptr->type == &RNA_Object) {
Object *ob = (Object *)ptr->data; Object *ob = (Object *)ptr->data;
/* Loc code is specific... */ /* Loc code is specific... */
if (strstr(identifier, "location")) { if (strstr(identifier, "location")) {
return ob->obmat[3][array_index]; return ob->obmat[3][array_index];
} }
copy_m4_m4(tmat, ob->obmat); copy_m4_m4(tmat, ob->obmat);
rotmode = ob->rotmode; rotmode = ob->rotmode;
} }