From 7220792f187f91a2ef3eb0c930a13674b2a8a80a Mon Sep 17 00:00:00 2001
From: Arystanbek Dyussenov <arystan.d@gmail.com>
Date: Wed, 19 Aug 2009 09:52:13 +0000
Subject: Various fixes in rna_*_api.c files to remove compiler warnings.

---
 source/blender/makesrna/intern/rna_action_api.c | 2 ++
 source/blender/makesrna/intern/rna_image_api.c  | 2 ++
 source/blender/makesrna/intern/rna_internal.h   | 6 ++++--
 source/blender/makesrna/intern/rna_mesh_api.c   | 3 +++
 source/blender/makesrna/intern/rna_object_api.c | 2 +-
 source/blender/makesrna/intern/rna_pose_api.c   | 4 ++--
 source/blender/makesrna/intern/rna_scene_api.c  | 4 ++++
 7 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'source/blender/makesrna/intern')

diff --git a/source/blender/makesrna/intern/rna_action_api.c b/source/blender/makesrna/intern/rna_action_api.c
index 2b51a424fcf..11efa6d5f8a 100644
--- a/source/blender/makesrna/intern/rna_action_api.c
+++ b/source/blender/makesrna/intern/rna_action_api.c
@@ -36,6 +36,8 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BKE_action.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_curve_types.h"
 
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index ccc9846600d..fee379cd285 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -41,6 +41,8 @@
 #include "BKE_utildefines.h"
 #include "BKE_image.h"
 
+#include "MEM_guardedalloc.h"
+
 /*
   User should check if returned path exists before copying a file there.
 
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index cff77fbb34b..af94f0ccc6f 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -197,13 +197,15 @@ void rna_Object_update_data(struct bContext *C, struct PointerRNA *ptr);
 
 /* API functions */
 
+void RNA_api_action(StructRNA *srna);
+void RNA_api_image(struct StructRNA *srna);
 void RNA_api_main(struct StructRNA *srna);
+void RNA_api_material(StructRNA *srna);
 void RNA_api_mesh(struct StructRNA *srna);
 void RNA_api_object(struct StructRNA *srna);
+void RNA_api_scene(struct StructRNA *srna); 
 void RNA_api_ui_layout(struct StructRNA *srna);
 void RNA_api_wm(struct StructRNA *srna);
-void RNA_api_scene(struct StructRNA *srna); 
-void RNA_api_material(StructRNA *srna);
 
 /* ID Properties */
 
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index 9d4dad1fb5b..1db2f155d14 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -42,6 +42,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
+#include "BKE_material.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
@@ -52,6 +53,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "MEM_guardedalloc.h"
+
 static void rna_Mesh_calc_edges(Mesh *mesh)
 {
 	CustomData edata;
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index f0a42987848..3c79c1cbc21 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -273,7 +273,7 @@ static void rna_Object_convert_to_triface(Object *ob, bContext *C, ReportList *r
 		make_editMesh(sce, ob);
 
 	/* select all */
-	EM_set_flag_all(me->edit_mesh, SELECT);
+	EM_select_all(me->edit_mesh);
 
 	convert_to_triface(me->edit_mesh, 0);
 
diff --git a/source/blender/makesrna/intern/rna_pose_api.c b/source/blender/makesrna/intern/rna_pose_api.c
index 9ac7713b2e9..42bb52d8544 100644
--- a/source/blender/makesrna/intern/rna_pose_api.c
+++ b/source/blender/makesrna/intern/rna_pose_api.c
@@ -45,8 +45,8 @@
 
 void RNA_api_pose(StructRNA *srna)
 {
-	FunctionRNA *func;
-	PropertyRNA *parm;
+	/* FunctionRNA *func; */
+	/* PropertyRNA *parm; */
 
 }
 
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index f3cbb630df5..076fe38ed2f 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -38,8 +38,12 @@
 #ifdef RNA_RUNTIME
 
 #include "BKE_scene.h"
+#include "BKE_depsgraph.h"
+
 #include "ED_object.h"
 
+#include "WM_api.h"
+
 static void rna_Scene_add_object(Scene *sce, ReportList *reports, Object *ob)
 {
 	Base *base= object_in_scene(ob, sce);
-- 
cgit v1.2.3