Minor change to last commit
authorCampbell Barton <ideasman42@gmail.com>
Mon, 5 Feb 2018 06:56:09 +0000 (17:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 5 Feb 2018 06:56:09 +0000 (17:56 +1100)
Keep mode checks simple, nest other checks in their body.

source/blender/editors/util/ed_util.c

index c920c4524a13f949a4f747f69e86c32766132e42..b34605f6af3f03064681f077e46880291e6b4ee3 100644 (file)
@@ -168,23 +168,23 @@ bool ED_editors_flush_edits(const bContext *C, bool for_render)
         * exiting we might not have a context for edit object and multiple sculpt
         * objects can exist at the same time */
        for (ob = bmain->object.first; ob; ob = ob->id.next) {
-               if ((ob->mode & OB_MODE_SCULPT) &&
-                   /* Don't allow flushing while in the middle of a stroke (frees data in use).
-                    * Auto-save prevents this from happening but scripts may cause a flush on saving: T53986. */
-                   ((ob->sculpt && ob->sculpt->cache) == 0))
-               {
-                       /* flush multires changes (for sculpt) */
-                       multires_force_update(ob);
-                       has_edited = true;
-
-                       if (for_render) {
-                               /* flush changes from dynamic topology sculpt */
-                               BKE_sculptsession_bm_to_me_for_render(ob);
-                       }
-                       else {
-                               /* Set reorder=false so that saving the file doesn't reorder
-                                * the BMesh's elements */
-                               BKE_sculptsession_bm_to_me(ob, false);
+               if (ob->mode & OB_MODE_SCULPT) {
+                       /* Don't allow flushing while in the middle of a stroke (frees data in use).
+                        * Auto-save prevents this from happening but scripts may cause a flush on saving: T53986. */
+                       if ((ob->sculpt && ob->sculpt->cache) == 0) {
+                               /* flush multires changes (for sculpt) */
+                               multires_force_update(ob);
+                               has_edited = true;
+
+                               if (for_render) {
+                                       /* flush changes from dynamic topology sculpt */
+                                       BKE_sculptsession_bm_to_me_for_render(ob);
+                               }
+                               else {
+                                       /* Set reorder=false so that saving the file doesn't reorder
+                                        * the BMesh's elements */
+                                       BKE_sculptsession_bm_to_me(ob, false);
+                               }
                        }
                }
                else if (ob->mode & OB_MODE_EDIT) {