[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33133] trunk/blender/source: fixes from r33127

[Campbell Barton]

Revision: 33133
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33133
Author:   campbellbarton
Date:     2010-11-17 15:36:19 +0100 (Wed, 17 Nov 2010)

Log Message:
-----------
fixes from r33127

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_ops.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2010-11-17 14:02:36 UTC (rev 33132)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2010-11-17 14:36:19 UTC (rev 33133)
@@ -418,7 +418,7 @@
 	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);
 	Text *txt;

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-11-17 14:02:36 UTC (rev 33132)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-11-17 14:36:19 UTC (rev 33133)
@@ -2375,7 +2375,7 @@
 	 * to be shown instead of icon when appropriate...
 	 */
 	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
 		uiDefIconBut(block, LABEL, 0, icon, 2, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "");
 	

Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2010-11-17 14:02:36 UTC (rev 33132)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2010-11-17 14:36:19 UTC (rev 33133)
@@ -777,8 +777,8 @@
 
 					mat3_to_compatible_eul(blenderObject->rot, blenderObject->rot, tmat);
 
-					insert_keyframe(&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, "location", -1, frameNumber, INSERTKEY_FAST);
+					insert_keyframe(NULL, &blenderObject->id, NULL, NULL, "rotation_euler", -1, frameNumber, INSERTKEY_FAST);
 
 #if 0
 					const MT_Point3& position = gameObj->NodeGetWorldPosition();