[Bf-blender-cvs] [03b46f7941e] blender2.8: Cleanup: quiet warning
Campbell Barton
noreply at git.blender.org
Mon Jun 26 23:33:23 CEST 2017
Commit: 03b46f7941e17906b193db39f1ff4339b02b58c6
Author: Campbell Barton
Date: Tue Jun 27 07:37:27 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB03b46f7941e17906b193db39f1ff4339b02b58c6
Cleanup: quiet warning
Passing NULL arg when nonnull attr is used.
===================================================================
M source/blender/editors/transform/transform.c
===================================================================
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 81d8f64045f..87bf23fd710 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2015,8 +2015,10 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
View3D *v3d = t->view;
v3d->twmode = t->current_orientation;
- BLI_assert(BKE_workspace_transform_orientation_get_index(CTX_wm_workspace(C), t->custom_orientation)
- == v3d->custom_orientation_index);
+
+ BLI_assert(((v3d->custom_orientation_index == -1) && (t->custom_orientation == NULL)) ||
+ (BKE_workspace_transform_orientation_get_index(
+ CTX_wm_workspace(C), t->custom_orientation) == v3d->custom_orientation_index));
}
}
}
More information about the Bf-blender-cvs
mailing list