Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-05-06 09:49:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-05-06 09:49:25 +0300
commitbc1a7d92830cb4fdf4971b7eda6201a3b6894f1c (patch)
tree8a1fd4eb2d7d00c14ec6da9f381e1fd4bbca9059 /source
parent304501193be6fe1bedd19e819841a3a5363a79ef (diff)
Cleanup: warnings
Values set but not used
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/scene.c2
-rw-r--r--source/blender/blenlib/intern/graph.c2
-rw-r--r--source/blender/bmesh/intern/bmesh_mesh_conv.h2
-rw-r--r--source/blender/bmesh/tools/bmesh_decimate_dissolve.c1
-rw-r--r--source/blender/editors/armature/armature_utils.c1
-rw-r--r--source/blender/editors/interface/interface_handlers.c3
-rw-r--r--source/blender/modifiers/intern/MOD_laplaciandeform.c1
7 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2e3b86c0a51..dce4effc21c 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2429,7 +2429,6 @@ SceneRenderView *BKE_scene_multiview_render_view_findindex(const RenderData *rd,
if ((rd->scemode & R_MULTIVIEW) == 0)
return NULL;
- nr = 0;
for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
if (nr++ == view_id)
@@ -2460,7 +2459,6 @@ int BKE_scene_multiview_view_id_get(const RenderData *rd, const char *viewname)
if ((!viewname) || (!viewname[0]))
return 0;
- nr = 0;
for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
if (STREQ(viewname, srv->name)) {
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 81cc9fde01f..911e8aae340 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -578,7 +578,7 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
unit = ring;
/* fill in the ring */
- for (unit = ring, i = 0; i < root_node->degree; i++) {
+ for (i = 0; i < root_node->degree; i++) {
BArc *connectedArc = root_node->arcs[i];
/* depth is store as a negative in flag. symmetry level is positive */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h
index 218d821913d..7cbfe2d9210 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.h
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h
@@ -52,7 +52,7 @@ struct BMeshFromMeshParams {
void BM_mesh_bm_from_me(
BMesh *bm, struct Mesh *me,
const struct BMeshFromMeshParams *params)
-ATTR_NONNULL(1, 2, 3);
+ATTR_NONNULL(1, 3);
struct BMeshToMeshParams {
unsigned int calc_tessface : 1;
diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
index 1a16bd13fef..ad35d57f35b 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
@@ -296,7 +296,6 @@ void BM_mesh_decimate_dissolve_ex(
/* --- setup heap --- */
eheap = BLI_heap_new_ex(einput_len);
- eheap_table = _heap_table;
/* wire -> tag */
BM_ITER_MESH (e_iter, &iter, bm, BM_EDGES_OF_MESH) {
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index 61ed7fdc41b..85c6835a8bb 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -179,7 +179,6 @@ EditBone *ED_armature_bone_find_shared_parent(EditBone *ebone_child[], const uns
/* accumulate */
for (i = 0; i < ebone_child_tot; i++) {
- ebone_iter = ebone_child[i];
for (ebone_iter = ebone_child[i]->parent; ebone_iter; ebone_iter = ebone_iter->parent) {
EBONE_TEMP_UINT(ebone_iter) += 1;
}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 2bca5498f6f..10ab85a6142 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7371,7 +7371,6 @@ static void ui_blocks_set_tooltips(ARegion *ar, const bool enable)
static bool ui_region_contains_point_px(ARegion *ar, int x, int y)
{
- uiBlock *block = ar->uiblocks.first;
rcti winrct;
/* scale down area rect to exclude shadow */
@@ -7379,7 +7378,7 @@ static bool ui_region_contains_point_px(ARegion *ar, int x, int y)
/* check if the mouse is in the region */
if (!BLI_rcti_isect_pt(&winrct, x, y)) {
- for (block = ar->uiblocks.first; block; block = block->next)
+ for (uiBlock *block = ar->uiblocks.first; block; block = block->next)
block->auto_open = false;
return false;
diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c
index d4f02d923d3..ce3fdc4bbe8 100644
--- a/source/blender/modifiers/intern/MOD_laplaciandeform.c
+++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c
@@ -339,7 +339,6 @@ static void rotateDifferentialCoordinates(LaplacianSystem *sys)
pi[1] = EIG_linear_solver_variable_get(sys->context, 1, i);
pi[2] = EIG_linear_solver_variable_get(sys->context, 2, i);
zero_v3(ni);
- num_fni = 0;
num_fni = sys->ringf_map[i].count;
for (fi = 0; fi < num_fni; fi++) {
const unsigned int *vin;