Revision: 22627
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22627
Author: kazanbas
Date: 2009-08-19 11:52:13 +0200 (Wed, 19 Aug 2009)
Log Message:
-----------
Various fixes in rna_*_api.c files to remove compiler warnings.
Modified Paths:
--------------
branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_action_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2009-kazanbas/source/blender/python/SConscript
branches/soc-2009-kazanbas/source/creator/creator.c
Added Paths:
-----------
branches/soc-2009-kazanbas/source/creator/tests/test.c
branches/soc-2009-kazanbas/source/creator/tests/test.h
Removed Paths:
-------------
branches/soc-2009-kazanbas/source/creator/tests/alltest.c
Modified: branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
2009-08-19 09:52:13 UTC (rev 22627)
@@ -118,6 +118,7 @@
void EM_select_face_fgon(struct EditMesh *em, struct EditFace *efa,
int val);
void EM_select_swap(struct EditMesh *em);
void EM_toggle_select_all(struct EditMesh *em);
+void EM_select_all(struct EditMesh *em);
void EM_selectmode_flush(struct EditMesh *em);
void EM_deselect_flush(struct EditMesh *em);
void EM_selectmode_set(struct EditMesh *em);
Modified: branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -3288,6 +3288,11 @@
EM_set_flag_all(em, SELECT);
}
+void EM_select_all(EditMesh *em)
+{
+ EM_set_flag_all(em, SELECT);
+}
+
static int toggle_select_all_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_action_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_action_api.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_action_api.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -36,6 +36,8 @@
#ifdef RNA_RUNTIME
+#include "BKE_action.h"
+
#include "DNA_anim_types.h"
#include "DNA_curve_types.h"
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image_api.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image_api.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -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.
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
2009-08-19 09:52:13 UTC (rev 22627)
@@ -197,13 +197,15 @@
/* 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 */
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh_api.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh_api.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -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;
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_api.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_api.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -273,7 +273,7 @@
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);
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose_api.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose_api.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -45,8 +45,8 @@
void RNA_api_pose(StructRNA *srna)
{
- FunctionRNA *func;
- PropertyRNA *parm;
+ /* FunctionRNA *func; */
+ /* PropertyRNA *parm; */
}
Modified:
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene_api.c
2009-08-19 09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene_api.c
2009-08-19 09:52:13 UTC (rev 22627)
@@ -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);
Modified: branches/soc-2009-kazanbas/source/blender/python/SConscript
===================================================================
--- branches/soc-2009-kazanbas/source/blender/python/SConscript 2009-08-19
09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/blender/python/SConscript 2009-08-19
09:52:13 UTC (rev 22627)
@@ -3,7 +3,7 @@
sources = env.Glob('intern/*.c')
-incs = '. ../editors/include ../makesdna ../makesrna ../makesrna/intern
../blenlib ../blenkernel ../nodes'
+incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel
../nodes'
incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager'
incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
incs += ' ' + env['BF_PYTHON_INC']
Modified: branches/soc-2009-kazanbas/source/creator/creator.c
===================================================================
--- branches/soc-2009-kazanbas/source/creator/creator.c 2009-08-19 09:35:22 UTC
(rev 22626)
+++ branches/soc-2009-kazanbas/source/creator/creator.c 2009-08-19 09:52:13 UTC
(rev 22627)
@@ -97,6 +97,10 @@
#include "binreloc.h"
#endif
+#ifdef WITH_UNIT_TEST
+#include "tests/test.h"
+#endif
+
// from buildinfo.c
#ifdef BUILD_DATE
extern char * build_date;
Deleted: branches/soc-2009-kazanbas/source/creator/tests/alltest.c
===================================================================
--- branches/soc-2009-kazanbas/source/creator/tests/alltest.c 2009-08-19
09:35:22 UTC (rev 22626)
+++ branches/soc-2009-kazanbas/source/creator/tests/alltest.c 2009-08-19
09:52:13 UTC (rev 22627)
@@ -1,176 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <check.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "BKE_blender.h"
-#include "BKE_image.h"
-#include "BKE_utildefines.h"
-#include "BKE_global.h"
-
-#include "BLI_listbase.h"
-#include "BLI_util.h"
-#include "BLI_fileops.h"
-#include "BLI_string.h"
-
-#include "DNA_image_types.h"
-
-char bprogname[FILE_MAXDIR+FILE_MAXFILE];
-char btempdir[FILE_MAXDIR+FILE_MAXFILE];
-
-typedef struct ImageTestResult {
- char *path;
- char *rel;
- int ret;
-} ImageTestResult;
-
-typedef struct ImageTestData {
- char *path; /* image filename */
- ImageTestResult result[10];
-} ImageTestData;
-
-/* check that BKE_copy_images manipulates paths correctly */
-START_TEST(test_copy_images)
-{
- char **dir;
- ImageTestData *test;
- int i,j;
-
-#ifdef WIN32
- /* TBD... */
-#else
- /*
- XXX are these paths possible in image->name?:
-
- ./foo/image.png
- ../foo/image.png
-
- if so, BKE_copy_images currently doesn't support them!
- */
-
- const char *blend_dir = "/home/user/foo";
- char *dest_dir[] = {"/home/user/", "/home/user", "/home/user/export/",
"/home/user/foo/", NULL};
-
- static ImageTestData test_data[] = {
-
- /* image path | [expected output path | corresponding relative
path | expected return value] */
-
- /* relative, 0 level deep */
- {"//image.png", {{"/home/user/image.png", "image.png", 1},
- {"/home/user/image.png",
"image.png", 1},
-
{"/home/user/export/image.png", "image.png", 1},
- {"/home/user/foo/image.png",
"image.png", 2},}},
-
- /* relative, 1 level deep */
- {"//bar/image.png", {{"/home/user/bar/image.png",
"bar/image.png", 1},
-
{"/home/user/bar/image.png", "bar/image.png", 1},
-
{"/home/user/export/bar/image.png", "bar/image.png", 1},
-
{"/home/user/foo/bar/image.png", "bar/image.png", 2},}},
-
- /* relative, 2 level deep */
- {"//bar/foo/image.png", {{"/home/user/bar/foo/image.png",
"bar/foo/image.png", 1},
-
{"/home/user/bar/foo/image.png", "bar/foo/image.png", 1},
-
{"/home/user/export/bar/foo/image.png", "bar/foo/image.png", 1},
-
{"/home/user/foo/bar/foo/image.png", "bar/foo/image.png", 2},}},
-
- /* absolute, not under .blend dir */
- {"/home/user/bar/image.png", {{"/home/user/image.png",
"image.png", 1},
-
{"/home/user/image.png", "image.png", 1},
-
{"/home/user/export/image.png", "image.png", 1},
-
{"/home/user/foo/image.png", "image.png", 1},}},
-
- /* absolute, under .blend dir, 0 level deep */
- {"/home/user/foo/image.png", {{"/home/user/image.png",
"image.png", 1},
-
{"/home/user/image.png", "image.png", 1},
-
{"/home/user/export/image.png", "image.png", 1},
-
{"/home/user/foo/image.png", "image.png", 2},}},
-
- /* absolute, under .blend dir, 1 level deep */
- {"/home/user/foo/bar/image.png", {{"/home/user/bar/image.png",
"bar/image.png", 1},
-
{"/home/user/bar/image.png", "bar/image.png", 1},
-
{"/home/user/export/bar/image.png", "bar/image.png", 1},
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
