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

Brecht Van Lommel brecht at blender.org
Mon Aug 17 00:49:17 CEST 2009


Revision: 22540
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22540
Author:   blendix
Date:     2009-08-17 00:49:17 +0200 (Mon, 17 Aug 2009)

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

* Use scene->r.audio instead of scene->audio everywhere, was using both still.
* Fix time_top_left_3dwindow link error, not sure why this happens, somehow
  with scons building it seems that files (like time_header.c) wich are not
  called from the same .a module get stripped?

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
    branches/blender2.5/blender/source/blender/editors/space_time/time_header.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c	2009-08-16 22:48:30 UTC (rev 22539)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c	2009-08-16 22:49:17 UTC (rev 22540)
@@ -403,7 +403,7 @@
 	pset->brush[PE_BRUSH_CUT].strength= 100;
 	
 	sce->jumpframe = 10;
-	sce->audio.mixrate = 44100;
+	sce->r.audio.mixrate = 44100;
 
 	strcpy(sce->r.backbuf, "//backbuf");
 	strcpy(sce->r.pic, U.renderdir);

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-16 22:48:30 UTC (rev 22539)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-16 22:49:17 UTC (rev 22540)
@@ -416,7 +416,7 @@
 	int cfra = CFRA;
 	float fps = FPS;
 
-	if(scene->audio.flag & AUDIO_SCRUB && !CTX_wm_screen(C)->animtimer)
+	if(scene->r.audio.flag & AUDIO_SCRUB && !CTX_wm_screen(C)->animtimer)
 	{
 		AUD_lock();
 

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2009-08-16 22:48:30 UTC (rev 22539)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2009-08-16 22:49:17 UTC (rev 22540)
@@ -1570,7 +1570,7 @@
 	/* XXX future: do all windows */
 	scene_update_for_newframe(scene, ED_screen_view3d_layers(screen)); /* BKE_scene.h */
 	
-	//if ( (CFRA>1) && (!mute) && (scene->audio.flag & AUDIO_SCRUB)) 
+	//if ( (CFRA>1) && (!mute) && (scene->r.audio.flag & AUDIO_SCRUB)) 
 	//	audiostream_scrub( CFRA );
 	
 	/* 3d window, preview */

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-08-16 22:48:30 UTC (rev 22539)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-08-16 22:49:17 UTC (rev 22540)
@@ -2230,9 +2230,9 @@
 		int sync;
 
 		/* sync, don't sync, or follow scene setting */
-		if(scene->audio.flag & ANIMPLAY_FLAG_SYNC) sync= 1;
-		else if(scene->audio.flag & ANIMPLAY_FLAG_NO_SYNC) sync= 0;
-		else sync= (scene->audio.flag & AUDIO_SYNC);
+		if(sad->flag & ANIMPLAY_FLAG_SYNC) sync= 1;
+		else if(sad->flag & ANIMPLAY_FLAG_NO_SYNC) sync= 0;
+		else sync= (scene->r.audio.flag & AUDIO_SYNC);
 		
 		if(sync) {
 			/* skip frames */
@@ -2324,9 +2324,29 @@
 /* ****************** anim player, starts or ends timer ***************** */
 
 /* helper for screen_animation_play() - only to be used for TimeLine */
-// NOTE: defined in time_header.c for now...
-extern ARegion *time_top_left_3dwindow(bScreen *screen);
+ARegion *time_top_left_3dwindow(bScreen *screen)
+{
+	ARegion *aret= NULL;
+	ScrArea *sa;
+	int min= 10000;
+	
+	for(sa= screen->areabase.first; sa; sa= sa->next) {
+		if(sa->spacetype==SPACE_VIEW3D) {
+			ARegion *ar;
+			for(ar= sa->regionbase.first; ar; ar= ar->next) {
+				if(ar->regiontype==RGN_TYPE_WINDOW) {
+					if(ar->winrct.xmin - ar->winrct.ymin < min) {
+						aret= ar;
+						min= ar->winrct.xmin - ar->winrct.ymin;
+					}
+				}
+			}
+		}
+	}
 
+	return aret;
+}
+
 /* toggle operator */
 static int screen_animation_play(bContext *C, wmOperator *op, wmEvent *event)
 {

Modified: branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/time_header.c	2009-08-16 22:48:30 UTC (rev 22539)
+++ branches/blender2.5/blender/source/blender/editors/space_time/time_header.c	2009-08-16 22:49:17 UTC (rev 22540)
@@ -568,7 +568,7 @@
 	xco+= XIC;
 	
 	uiDefIconButBitS(block, TOG, AUDIO_SYNC, B_DIFF, ICON_SPEAKER,
-					 xco, yco, XIC, YIC, &(scene->audio.flag), 0, 0, 0, 0, "Play back and sync with audio from Sequence Editor");
+					 xco, yco, XIC, YIC, &(scene->r.audio.flag), 0, 0, 0, 0, "Play back and sync with audio from Sequence Editor");
 	
 	
 	/* always as last  */





More information about the Bf-blender-cvs mailing list