[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40290] branches/bmesh/blender/source/ blender/bmesh/intern/bmesh_mods.c: remove redundant NULL check
Campbell Barton
ideasman42 at gmail.com
Sat Sep 17 11:53:39 CEST 2011
Revision: 40290
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40290
Author: campbellbarton
Date: 2011-09-17 09:53:38 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
remove redundant NULL check
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-09-17 09:43:51 UTC (rev 40289)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-09-17 09:53:38 UTC (rev 40290)
@@ -301,29 +301,28 @@
if (nf) {
BM_Copy_Attributes(bm, bm, f, nf);
copy_v3_v3(nf->no, f->no);
- }
- /*handle multires update*/
- if (nf && nf != f && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
- BMLoop *l;
-
- l = bm_firstfaceloop(f);
- do {
- BM_loop_interp_from_face(bm, l, of, 0, 1);
- l = l->next;
- } while (l != bm_firstfaceloop(f));
+ /*handle multires update*/
+ if (nf != f && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
+ BMLoop *l;
- l = bm_firstfaceloop(nf);
- do {
- BM_loop_interp_from_face(bm, l, of, 0, 1);
- l = l->next;
- } while (l != bm_firstfaceloop(nf));
-
- BM_Kill_Face(bm, of);
-
- BM_multires_smooth_bounds(bm, f);
- if (nf)
+ l = bm_firstfaceloop(f);
+ do {
+ BM_loop_interp_from_face(bm, l, of, 0, 1);
+ l = l->next;
+ } while (l != bm_firstfaceloop(f));
+
+ l = bm_firstfaceloop(nf);
+ do {
+ BM_loop_interp_from_face(bm, l, of, 0, 1);
+ l = l->next;
+ } while (l != bm_firstfaceloop(nf));
+
+ BM_Kill_Face(bm, of);
+
+ BM_multires_smooth_bounds(bm, f);
BM_multires_smooth_bounds(bm, nf);
+ }
}
return nf;
More information about the Bf-blender-cvs
mailing list