tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

fix for own error in active bone commit, wasnt checking object type was an armature 

also fix for warning with printf
This commit is contained in:
Campbell Barton 2009-11-10 13:20:32 +00:00
parent af2e6c38e9
commit 1f2fe7ec14
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/screen/screen_context.c
View File

@ -224,17 +224,19 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
}
}
else if(CTX_data_equals(member, "active_bone")) {
bArmature *arm= (obact) ? obact->data : NULL;
if(arm->edbo) {
if(arm->act_edbone) {
CTX_data_pointer_set(result, &arm->id, &RNA_EditBone, arm->act_edbone);
return 1;
if(obact && obact->type == OB_ARMATURE) {
bArmature *arm= obact->data;
if(arm->edbo) {
if(arm->act_edbone) {
CTX_data_pointer_set(result, &arm->id, &RNA_EditBone, arm->act_edbone);
return 1;
}
}
}
else {
if(arm->act_bone) {
CTX_data_pointer_set(result, &arm->id, &RNA_Bone, arm->act_bone);
return 1;
else {
if(arm->act_bone) {
CTX_data_pointer_set(result, &arm->id, &RNA_Bone, arm->act_bone);
return 1;
}
}
}
}

2
source/gameengine/GameLogic/SCA_ExpressionController.cpp
View File

@ -107,7 +107,7 @@ void SCA_ExpressionController::Trigger(SCA_LogicManager* logicmgr)
{
if (value->IsError())
{
printf(value->GetText());
printf("%s\n", value->GetText().ReadPtr());
} else
{
float num = (float)value->GetNumber();