[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18502] branches/blender2.5/blender/source /blender/editors: 2.5
Ton Roosendaal
ton at blender.org
Wed Jan 14 17:37:52 CET 2009
Revision: 18502
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18502
Author: ton
Date: 2009-01-14 17:37:52 +0100 (Wed, 14 Jan 2009)
Log Message:
-----------
2.5
A small round of warning cleanups; unused variables, missing
headers and some const types.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
branches/blender2.5/blender/source/blender/editors/include/ED_markers.h
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -567,7 +567,7 @@
}
}
-static int find_nearest_marker_time(ListBase *markers, float dx)
+int find_nearest_marker_time(ListBase *markers, float dx)
{
TimeMarker *marker, *nearest= NULL;
float dist, min_dist= 1000000;
Modified: branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -58,9 +58,10 @@
#include "PIL_time.h"
#include "ED_anim_api.h"
+#include "ED_gpencil.h"
#include "ED_keyframes_edit.h"
#include "ED_keyframes_draw.h"
-#include "ED_gpencil.h"
+#include "ED_markers.h"
#include "ED_util.h"
#include "ED_types.h"
@@ -71,7 +72,6 @@
static void BIF_undo_push() {}
static void error() {}
static void *get_action_context() {return NULL;}
-static int find_nearest_marker_time() {return 1;}
/* XXX */
@@ -600,7 +600,7 @@
static short snap_gpf_nearmarker (bGPDframe *gpf, Scene *scene)
{
if (gpf->flag & GP_FRAME_SELECT)
- gpf->framenum= (int)find_nearest_marker_time((float)gpf->framenum);
+ gpf->framenum= (int)find_nearest_marker_time(&scene->markers, (float)gpf->framenum);
return 0;
}
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_markers.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_markers.h 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_markers.h 2009-01-14 16:37:52 UTC (rev 18502)
@@ -39,11 +39,13 @@
struct bContext;
void draw_markers_time(const struct bContext *C, int flag);
+int find_nearest_marker_time(ListBase *markers, float dx);
/* called in screen_ops.c:ED_operatortypes_screen() */
void ED_marker_operatortypes(void);
/* called in screen_ops.c:ED_keymap_screen() */
void ED_marker_keymap(struct wmWindowManager *wm);
+
#endif /* ED_MARKERS_H */
Modified: branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -39,11 +39,12 @@
#include "BIF_gl.h"
-#include "ED_screen.h"
+#include "ED_anim_api.h"
+#include "ED_mesh.h"
#include "ED_object.h"
-#include "ED_mesh.h"
#include "ED_space_api.h"
-#include "ED_anim_api.h"
+#include "ED_screen.h"
+#include "ED_sculpt.h"
ARegionType *ED_regiontype_from_id(SpaceType *st, int regionid)
Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -662,7 +662,7 @@
{
SpaceIpo *sipo= sa->spacedata.first;
//View2D *v2d= &ar->v2d;
- EditIpo *ei;
+ // EditIpo *ei;
if(sipo->editipo) {
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -2751,9 +2751,9 @@
static int node_delete_selection_exec(bContext *C, wmOperator *op)
{
- wmWindow *window= CTX_wm_window(C);
SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
ARegion *ar= CTX_wm_region(C);
+
node_delete(snode);
ED_region_tag_redraw(ar);
WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); /* Do we need to pass the scene? */
@@ -2765,7 +2765,6 @@
void NODE_OT_delete_selection(wmOperatorType *ot)
{
- PropertyRNA *prop;
/* identifiers */
ot->name= "Delete";
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -126,7 +126,7 @@
void do_node_addmenu(bContext *C, void *arg, int event)
{
// XXX enable
- ScrArea *curarea= CTX_wm_area(C);
+ // ScrArea *curarea= CTX_wm_area(C);
SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
bNode *node;
//float locx, locy;
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_select.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_select.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -106,7 +106,7 @@
static int node_select_exec(bContext *C, wmOperator *op)
{
- wmWindow *window= CTX_wm_window(C);
+ // XXX wmWindow *window= CTX_wm_window(C);
SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
ARegion *ar= CTX_wm_region(C);
int select_type;
Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c 2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c 2009-01-14 16:37:52 UTC (rev 18502)
@@ -135,8 +135,8 @@
void TFM_OT_transform(struct wmOperatorType *ot)
{
PropertyRNA *prop;
- static float value[4] = {0, 0, 0};
- static float mtx[3][3] = {{1, 0, 0},{0, 1, 0},{0, 0, 1}};
+ static const float value[4] = {0, 0, 0};
+ static const float mtx[3][3] = {{1, 0, 0},{0, 1, 0},{0, 0, 1}};
/* identifiers */
ot->name = "Transform";
@@ -162,7 +162,7 @@
prop = RNA_def_property(ot->srna, "constraint_matrix", PROP_FLOAT, PROP_MATRIX);
RNA_def_property_array(prop, 9);
- RNA_def_property_float_array_default(prop, mtx);
+ RNA_def_property_float_array_default(prop, mtx[0]);
}
void transform_operatortypes(void)
More information about the Bf-blender-cvs
mailing list