[Bf-blender-cvs] [18c0a15] master: Cleanup

Campbell Barton noreply at git.blender.org
Wed Jul 29 12:23:16 CEST 2015


Commit: 18c0a15e1ebaa94177b848a2dc6ccc96a38dc5ed
Author: Campbell Barton
Date:   Wed Jul 29 20:18:22 2015 +1000
Branches: master
https://developer.blender.org/rB18c0a15e1ebaa94177b848a2dc6ccc96a38dc5ed

Cleanup

===================================================================

M	source/blender/editors/space_view3d/drawmesh.c
M	source/blender/render/intern/source/render_result.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 6085f0c..d806dfa 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -662,7 +662,7 @@ static void update_tface_color_layer(DerivedMesh *dm, bool use_mcol)
 			copy_mode = COPY_PREV;
 		}
 		else if (ma && (ma->shade_flag & MA_OBCOLOR)) {
-			int loop_index = mp->loopstart;;
+			int loop_index = mp->loopstart;
 			for (j = 0; j < mp->totloop; j++, loop_index++) {
 				copy_v3_v3_char(&finalCol[loop_index].r, (char *)Gtexdraw.obcol);
 			}
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index a03bf3c..27fc412 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -905,7 +905,6 @@ RenderResult *render_result_new_from_exr(void *exrhandle, const char *colorspace
 	IMB_exr_multilayer_convert(exrhandle, rr, ml_addview_cb, ml_addlayer_cb, ml_addpass_cb);
 
 	for (rl = rr->layers.first; rl; rl = rl->next) {
-		int c=0;
 		rl->rectx = rectx;
 		rl->recty = recty;




More information about the Bf-blender-cvs mailing list