[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18994] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 18994
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18994
Author:   ton
Date:     2009-02-16 16:08:06 +0100 (Mon, 16 Feb 2009)

Log Message:
-----------
2.5

Some small fixes:

- handler operator exec gave too quick a warning for invalid area
  (set area context to NULL is OK :)
- 4-split 3D view with clip option didn't reset clip when 4-split
  was disabled
- creating a new 3d view didn't initialize buttons region correct.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-02-16 14:28:33 UTC (rev 18993)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-02-16 15:08:06 UTC (rev 18994)
@@ -1627,6 +1627,7 @@
 		if(sa->spacetype==SPACE_VIEW3D) {
 			RegionView3D *rv3d= ar->regiondata;
 			rv3d->viewlock= 0;
+			rv3d->rflag &= ~RV3D_CLIPPING;
 		}
 		
 		for(ar= sa->regionbase.first; ar; ar= arn) {

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c	2009-02-16 14:28:33 UTC (rev 18993)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c	2009-02-16 15:08:06 UTC (rev 18994)
@@ -138,7 +138,8 @@
 	
 	BLI_addtail(&v3d->regionbase, ar);
 	ar->regiontype= RGN_TYPE_UI;
-	ar->alignment= RGN_OVERLAP_LEFT;
+	ar->alignment= RGN_ALIGN_LEFT;
+	ar->flag = RGN_FLAG_HIDDEN;
 	
 	/* main area */
 	ar= MEM_callocN(sizeof(ARegion), "main area for view3d");

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c	2009-02-16 14:28:33 UTC (rev 18993)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c	2009-02-16 15:08:06 UTC (rev 18994)
@@ -1515,6 +1515,7 @@
 	
 	if(ar) {
 		ar->flag ^= RGN_FLAG_HIDDEN;
+		ar->v2d.flag &= ~V2D_IS_INITIALISED; /* XXX should become hide/unhide api? */
 		
 		ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
 		ED_area_tag_redraw(sa);

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2009-02-16 14:28:33 UTC (rev 18993)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2009-02-16 15:08:06 UTC (rev 18994)
@@ -468,22 +468,26 @@
 	bScreen *screen= CTX_wm_screen(C);
 	
 	if(screen && handler->op) {
-		ScrArea *sa;
-		
-		for(sa= screen->areabase.first; sa; sa= sa->next)
-			if(sa==handler->op_area)
-				break;
-		if(sa==NULL)
-			printf("internal error: handler (%s) has invalid area\n", handler->op->type->idname);
+		if(handler->op_area==NULL)
+			CTX_wm_area_set(C, NULL);
 		else {
-			ARegion *ar;
-			CTX_wm_area_set(C, sa);
-			for(ar= sa->regionbase.first; ar; ar= ar->next)
-				if(ar==handler->op_region)
+			ScrArea *sa;
+			
+			for(sa= screen->areabase.first; sa; sa= sa->next)
+				if(sa==handler->op_area)
 					break;
-			/* XXX no warning print here, after full-area and back regions are remade */
-			if(ar)
-				CTX_wm_region_set(C, ar);
+			if(sa==NULL)
+				printf("internal error: handler (%s) has invalid area\n", handler->op->type->idname);
+			else {
+				ARegion *ar;
+				CTX_wm_area_set(C, sa);
+				for(ar= sa->regionbase.first; ar; ar= ar->next)
+					if(ar==handler->op_region)
+						break;
+				/* XXX no warning print here, after full-area and back regions are remade */
+				if(ar)
+					CTX_wm_region_set(C, ar);
+			}
 		}
 	}
 }