[Bf-blender-cvs] [f8385de] master: Remove redundant NULL check

Campbell Barton noreply at git.blender.org
Mon Jun 8 17:28:47 CEST 2015


Commit: f8385de5edd67becf91f09e4974e102450a69238
Author: Campbell Barton
Date:   Tue Jun 9 00:20:34 2015 +1000
Branches: master
https://developer.blender.org/rBf8385de5edd67becf91f09e4974e102450a69238

Remove redundant NULL check

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index d2f53a2..b7f2f48 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4665,7 +4665,7 @@ void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
 		}
 	}
 
-	if (v3d && v3d->localvd)
+	if (v3d->localvd)
 		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
 	else
 		WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
@@ -4675,7 +4675,7 @@ static int view3d_cursor3d_invoke(bContext *C, wmOperator *UNUSED(op), const wmE
 {
 	ED_view3d_cursor3d_update(C, event->mval);
 
-	return OPERATOR_FINISHED;	
+	return OPERATOR_FINISHED;
 }
 
 void VIEW3D_OT_cursor3d(wmOperatorType *ot)
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index f704e98..d0db55d 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -456,11 +456,11 @@ void wm_window_add_ghostwindows(wmWindowManager *wm)
 	if (wm_init_state.size_x == 0) {
 		wm_get_screensize(&wm_init_state.size_x, &wm_init_state.size_y);
 		
-	/* note!, this isnt quite correct, active screen maybe offset 1000s if PX,
-	 * we'd need a wm_get_screensize like function that gives offset,
-	 * in practice the window manager will likely move to the correct monitor */
-	wm_init_state.start_x = 0;
-	wm_init_state.start_y = 0;
+		/* note!, this isnt quite correct, active screen maybe offset 1000s if PX,
+		 * we'd need a wm_get_screensize like function that gives offset,
+		 * in practice the window manager will likely move to the correct monitor */
+		wm_init_state.start_x = 0;
+		wm_init_state.start_y = 0;
 
 #ifdef WITH_X11 /* X11 */
 		/* X11, start maximized but use default sane size */




More information about the Bf-blender-cvs mailing list