[Bf-blender-cvs] [fa5c238] multiview: Cleanup: headers, minor edits

Campbell Barton noreply at git.blender.org
Tue Mar 17 09:11:28 CET 2015


Commit: fa5c2389500a3c46a42c75dd7f4bb3ccb3bc2eaf
Author: Campbell Barton
Date:   Tue Mar 17 18:15:03 2015 +1100
Branches: multiview
https://developer.blender.org/rBfa5c2389500a3c46a42c75dd7f4bb3ccb3bc2eaf

Cleanup: headers, minor edits

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

M	source/blender/windowmanager/intern/wm_stereo.c
M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index 23f1074..fbf2f62 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -34,47 +34,33 @@
 #include <string.h>
 
 #include "DNA_listBase.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_view3d_types.h"
 
 #include "RNA_access.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_rect.h"
 #include "BLI_utildefines.h"
-#include "BLI_math_base.h"
 
 #include "BIF_gl.h"
 
 #include "BKE_context.h"
-#include "BKE_image.h"
 #include "BKE_global.h"
-#include "BKE_screen.h"
 #include "BKE_report.h"
 
 #include "GHOST_C-api.h"
 
 #include "ED_node.h"
-#include "ED_view3d.h"
 #include "ED_screen.h"
 
 #include "GPU_glew.h"
-#include "GPU_draw.h"
-#include "GPU_extensions.h"
-
-#include "PIL_time.h"
-
-#include "RE_engine.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 #include "wm.h"
 #include "wm_draw.h" /* wmDrawTriple */
 #include "wm_window.h"
-#include "wm_event_system.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -403,7 +389,7 @@ static bool wm_stereo3d_required(bScreen *screen)
 				/* images should always show in stereo, even if
 				 * the file doesn't have views enabled */
 				sima = sa->spacedata.first;
-				if ((sima->image) && (sima->image->flag & IMA_IS_STEREO) &&
+				if (sima->image && (sima->image->flag & IMA_IS_STEREO) &&
 				    (sima->iuser.flag & IMA_SHOW_STEREO))
 				{
 					return true;
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 154f13a..852088f 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -263,7 +263,7 @@ wmWindow *wm_window_copy(bContext *C, wmWindow *winorig)
 
 	win->drawmethod = U.wmdrawmethod;
 
-	win->drawdata.first = win->drawdata.last = NULL;
+	BLI_listbase_clear(&win->drawdata);
 
 	*win->stereo3d_format = *winorig->stereo3d_format;




More information about the Bf-blender-cvs mailing list