[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59922] trunk/blender/source/blender: code cleanup: quiet warnings
Campbell Barton
ideasman42 at gmail.com
Sun Sep 8 08:05:43 CEST 2013
Revision: 59922
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59922
Author: campbellbarton
Date: 2013-09-08 06:05:42 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
code cleanup: quiet warnings
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c 2013-09-08 03:39:45 UTC (rev 59921)
+++ trunk/blender/source/blender/bmesh/operators/bmo_fill_grid.c 2013-09-08 06:05:42 UTC (rev 59922)
@@ -568,7 +568,7 @@
static bool bm_edge_test_cb(BMEdge *e, void *bm_v)
{
- return BMO_elem_flag_test((BMesh *)bm_v, e, EDGE_MARK);
+ return BMO_elem_flag_test_bool((BMesh *)bm_v, e, EDGE_MARK);
}
static bool bm_edge_test_rail_cb(BMEdge *e, void *UNUSED(bm_v))
@@ -686,6 +686,8 @@
mat_nr, use_smooth, use_interp_simple);
change = true;
+
+
cleanup:
BM_mesh_edgeloops_free(&eloops);
BM_mesh_edgeloops_free(&eloops_rail);
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2013-09-08 03:39:45 UTC (rev 59921)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2013-09-08 06:05:42 UTC (rev 59922)
@@ -560,7 +560,7 @@
static int editmode_toggle_exec(bContext *C, wmOperator *op)
{
const int mode_flag = OB_MODE_EDIT;
- const bool is_mode_set = CTX_data_edit_object(C);
+ const bool is_mode_set = (CTX_data_edit_object(C) != NULL);
ToolSettings *toolsettings = CTX_data_tool_settings(C);
if (!is_mode_set) {
Modified: trunk/blender/source/blender/render/intern/source/voxeldata.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/voxeldata.c 2013-09-08 03:39:45 UTC (rev 59921)
+++ trunk/blender/source/blender/render/intern/source/voxeldata.c 2013-09-08 06:05:42 UTC (rev 59922)
@@ -109,8 +109,8 @@
static int load_frame_raw8(VoxelData *vd, FILE *fp, int frame)
{
const size_t size = vd_resol_size(vd);
+ size_t i;
char *data_c;
- int i;
if (is_vd_res_ok(vd) == FALSE)
return 0;
More information about the Bf-blender-cvs
mailing list