[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54728] trunk/blender/source/blender: Fix some compiler errors/warnings in last commit.

[Brecht Van Lommel]

Revision: 54728
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54728
Author:   blendix
Date:     2013-02-21 19:42:46 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Fix some compiler errors/warnings in last commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/collada/ArmatureExporter.h
    trunk/blender/source/blender/editors/object/object_transform.c
    trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_snap.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-02-21 19:33:04 UTC (rev 54727)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-02-21 19:42:46 UTC (rev 54728)
@@ -117,6 +117,7 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_deform.h"
+#include "BKE_depsgraph.h"
 #include "BKE_effect.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h" // for G

Modified: trunk/blender/source/blender/collada/ArmatureExporter.h
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.h	2013-02-21 19:33:04 UTC (rev 54727)
+++ trunk/blender/source/blender/collada/ArmatureExporter.h	2013-02-21 19:42:46 UTC (rev 54728)
@@ -70,7 +70,6 @@
 	//void operator()(Object *ob);
 
 private:
-	Scene *scene;
 	UnitConverter converter;
 	const ExportSettings *export_settings;
 

Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c	2013-02-21 19:33:04 UTC (rev 54727)
+++ trunk/blender/source/blender/editors/object/object_transform.c	2013-02-21 19:42:46 UTC (rev 54728)
@@ -213,7 +213,6 @@
 static int object_clear_transform_generic_exec(bContext *C, wmOperator *op, 
                                                void (*clear_func)(Object *), const char default_ksName[])
 {
-	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	KeyingSet *ks;
 	
@@ -316,7 +315,6 @@
 
 static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Main *bmain = CTX_data_main(C);
 	float *v1, *v3;
 	float mat[3][3];
 

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c	2013-02-21 19:33:04 UTC (rev 54727)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c	2013-02-21 19:42:46 UTC (rev 54728)
@@ -1824,7 +1824,6 @@
 
 static int material_drop_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Main *bmain = CTX_data_main(C);
 	Material *ma = NULL;
 	Object *ob = NULL;
 	SpaceOops *soops = CTX_wm_space_outliner(C);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_snap.c	2013-02-21 19:33:04 UTC (rev 54727)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_snap.c	2013-02-21 19:42:46 UTC (rev 54728)
@@ -532,7 +532,6 @@
 
 static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
 {
-	Main *bmain = CTX_data_main(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	RegionView3D *rv3d = CTX_wm_region_data(C);
@@ -673,7 +672,6 @@
 
 static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op))
 {
-	Main *bmain = CTX_data_main(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);