[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60250] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: replace VIEW3D_OP_OFS_LOCK_TEST() macro with static function view3d_operator_offset_lock_check()
Campbell Barton
ideasman42 at gmail.com
Fri Sep 20 03:43:07 CEST 2013
Revision: 60250
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60250
Author: campbellbarton
Date: 2013-09-20 01:43:06 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
replace VIEW3D_OP_OFS_LOCK_TEST() macro with static function view3d_operator_offset_lock_check()
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-09-20 01:24:00 UTC (rev 60249)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-09-20 01:43:06 UTC (rev 60250)
@@ -85,27 +85,24 @@
/* for ndof prints */
// #define DEBUG_NDOF_MOTION
-static void view3d_offset_lock_report(ReportList *reports)
+bool ED_view3d_offset_lock_check(struct View3D *v3d, struct RegionView3D *rv3d)
{
- BKE_report(reports, RPT_WARNING, "View offset is locked");
+ return (rv3d->persp != RV3D_CAMOB) && (v3d->ob_centre_cursor || v3d->ob_centre);
}
-bool ED_view3d_offset_lock_check(struct View3D *v3d, struct RegionView3D *rv3d)
+static bool view3d_operator_offset_lock_check(bContext *C, wmOperator *op)
{
- return (rv3d->persp != RV3D_CAMOB) && (v3d->ob_centre_cursor || v3d->ob_centre);
+ View3D *v3d = CTX_wm_view3d(C);
+ RegionView3D *rv3d = CTX_wm_region_view3d(C);
+ if (ED_view3d_offset_lock_check(v3d, rv3d)) {
+ BKE_report(op->reports, RPT_WARNING, "View offset is locked");
+ return true;
+ }
+ else {
+ return false;
+ }
}
-#define VIEW3D_OP_OFS_LOCK_TEST(C, op) \
- { \
- View3D *v3d_tmp = CTX_wm_view3d(C); \
- RegionView3D *rv3d_tmp = CTX_wm_region_view3d(C); \
- if (ED_view3d_offset_lock_check(v3d_tmp, rv3d_tmp)) { \
- view3d_offset_lock_report((op)->reports); \
- return OPERATOR_CANCELLED; \
- } \
- } (void)0
-
-
/* ********************** view3d_edit: view manipulations ********************* */
bool ED_view3d_camera_lock_check(View3D *v3d, RegionView3D *rv3d)
@@ -1191,8 +1188,9 @@
static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
- if (event->type != NDOF_MOTION)
+ if (event->type != NDOF_MOTION) {
return OPERATOR_CANCELLED;
+ }
else {
View3D *v3d = CTX_wm_view3d(C);
ViewOpsData *vod;
@@ -1274,8 +1272,9 @@
static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
- if (event->type != NDOF_MOTION)
+ if (event->type != NDOF_MOTION) {
return OPERATOR_CANCELLED;
+ }
else {
ViewOpsData *vod;
View3D *v3d = CTX_wm_view3d(C);
@@ -1372,14 +1371,16 @@
*/
static int ndof_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
- if (event->type != NDOF_MOTION)
+ if (event->type != NDOF_MOTION) {
return OPERATOR_CANCELLED;
+ }
else {
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
wmNDOFMotionData *ndof = (wmNDOFMotionData *) event->customdata;
- VIEW3D_OP_OFS_LOCK_TEST(C, op);
+ if (view3d_operator_offset_lock_check(C, op))
+ return OPERATOR_CANCELLED;
ED_view3d_camera_lock_init(v3d, rv3d);
@@ -1472,7 +1473,6 @@
return OPERATOR_CANCELLED;
}
else {
-
ViewOpsData *vod;
RegionView3D *rv3d;
@@ -2260,7 +2260,8 @@
{
ViewOpsData *vod;
- VIEW3D_OP_OFS_LOCK_TEST(C, op);
+ if (view3d_operator_offset_lock_check(C, op))
+ return OPERATOR_CANCELLED;
/* makes op->customdata */
viewops_data_alloc(C, op);
@@ -3819,7 +3820,8 @@
float zfac;
int pandir;
- VIEW3D_OP_OFS_LOCK_TEST(C, op);
+ if (view3d_operator_offset_lock_check(C, op))
+ return OPERATOR_CANCELLED;
pandir = RNA_enum_get(op->ptr, "type");
More information about the Bf-blender-cvs
mailing list