[Bf-blender-cvs] [c8d0d9b] master: Code Cleanup: tabs/spaces, no need to call CTX_data_edit_object twice
Campbell Barton
noreply at git.blender.org
Mon Jan 20 14:33:32 CET 2014
Commit: c8d0d9b383a53aadc704c1619418dea8031c9abf
Author: Campbell Barton
Date: Tue Jan 21 00:33:00 2014 +1100
https://developer.blender.org/rBc8d0d9b383a53aadc704c1619418dea8031c9abf
Code Cleanup: tabs/spaces, no need to call CTX_data_edit_object twice
===================================================================
M source/blender/editors/util/ed_util.c
===================================================================
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 44ef8e2..6e41fb9 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -145,16 +145,16 @@ void ED_editors_exit(bContext *C)
* rendering, copying, etc. */
void ED_editors_flush_edits(const bContext *C, bool for_render)
{
- Object *obact = CTX_data_active_object(C);
- Object *obedit = CTX_data_edit_object(C);
+ Object *obact = CTX_data_active_object(C);
+ Object *obedit = CTX_data_edit_object(C);
- /* get editmode results */
+ /* get editmode results */
if (obedit)
- ED_object_editmode_load(CTX_data_edit_object(C));
+ ED_object_editmode_load(obedit);
- if (obact && (obact->mode & OB_MODE_SCULPT)) {
- /* flush multires changes (for sculpt) */
- multires_force_update(obact);
+ if (obact && (obact->mode & OB_MODE_SCULPT)) {
+ /* flush multires changes (for sculpt) */
+ multires_force_update(obact);
if (for_render) {
/* flush changes from dynamic topology sculpt */
@@ -165,7 +165,7 @@ void ED_editors_flush_edits(const bContext *C, bool for_render)
* the BMesh's elements */
sculptsession_bm_to_me(obact, FALSE);
}
- }
+ }
}
/* ***** XXX: functions are using old blender names, cleanup later ***** */
More information about the Bf-blender-cvs
mailing list