Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixes from r33127

Browse Source
This commit is contained in:
Campbell Barton
2010-11-17 14:36:19 +00:00
parent 7bd944795f
commit 5a37333053
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface_ops.c
View File

@@ -418,7 +418,7 @@ static int reports_to_text_poll(bContext *C)
return CTX_wm_reports(C) != NULL; return CTX_wm_reports(C) != NULL;
} }
static int reports_to_text_exec(bContext *C, wmOperator *op) static int reports_to_text_exec(bContext *C, wmOperator *UNUSED(op))
{ {
ReportList *reports = CTX_wm_reports(C); ReportList *reports = CTX_wm_reports(C);
Text *txt; Text *txt;

2
source/blender/editors/interface/interface_templates.c
View File

@@ -2375,7 +2375,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
* to be shown instead of icon when appropriate... * to be shown instead of icon when appropriate...
*/ */
if (reports->list.first != reports->list.last) if (reports->list.first != reports->list.last)
uiDefIconButO(block, BUT, "UI_OT_reports_to_textblock", WM_OP_INVOKE_REGION_WIN, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Click to see rest of reports in textblock: 'Recent Reports'"); uiDefIconButO(block, BUT, "UI_OT_reports_to_textblock", WM_OP_INVOKE_REGION_WIN, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, "Click to see rest of reports in textblock: 'Recent Reports'");
else else
uiDefIconBut(block, LABEL, 0, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, ""); uiDefIconBut(block, LABEL, 0, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "");

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

@@ -777,8 +777,8 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
mat3_to_compatible_eul(blenderObject->rot, blenderObject->rot, tmat); mat3_to_compatible_eul(blenderObject->rot, blenderObject->rot, tmat);
insert_keyframe(&blenderObject->id, NULL, NULL, "location", -1, frameNumber, INSERTKEY_FAST); insert_keyframe(NULL, &blenderObject->id, NULL, NULL, "location", -1, frameNumber, INSERTKEY_FAST);
insert_keyframe(&blenderObject->id, NULL, NULL, "rotation_euler", -1, frameNumber, INSERTKEY_FAST); insert_keyframe(NULL, &blenderObject->id, NULL, NULL, "rotation_euler", -1, frameNumber, INSERTKEY_FAST);
#if 0 #if 0
const MT_Point3& position = gameObj->NodeGetWorldPosition(); const MT_Point3& position = gameObj->NodeGetWorldPosition();