[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26400] trunk/blender/source/blender: Two fixes, errors caused by drag n drop commit:

Ton Roosendaal ton at blender.org
Fri Jan 29 17:25:31 CET 2010


Revision: 26400
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26400
Author:   ton
Date:     2010-01-29 17:25:31 +0100 (Fri, 29 Jan 2010)

Log Message:
-----------
Two fixes, errors caused by drag n drop commit:

- Icons for brushes disabled List Box to work (paint buttons)
- Mouse-release in secondary Blender windows didn't get registered
  in window where mouse-press initiated.

And fixed annoyance: adding image strip makes it 25 frames long, so
you can drag and extend it easily. 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-01-29 15:20:25 UTC (rev 26399)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-01-29 16:25:31 UTC (rev 26400)
@@ -2204,7 +2204,7 @@
 		uiBlockSetEmboss(block, UI_EMBOSS);
 	}
 	else
-		uiItemLDrag(sub, itemptr, name, icon); /* fails, backdrop LISTROW... */
+		uiItemL(sub, name, icon); /* fails, backdrop LISTROW... */
 
 	/* free name */
 	if(namebuf)

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2010-01-29 15:20:25 UTC (rev 26399)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2010-01-29 16:25:31 UTC (rev 26400)
@@ -417,6 +417,8 @@
 	}
 	else {
 		BLI_split_dirfile_basic(seq_load.path, NULL, se->name);
+		seq->startstill= 25;
+		seq->endstill= 25;
 	}
 	
 	calc_sequence_disp(seq);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-01-29 15:20:25 UTC (rev 26399)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-01-29 16:25:31 UTC (rev 26400)
@@ -1962,7 +1962,7 @@
 		/* let's skip windows having modal handlers now */
 		/* potential XXX ugly... I wouldn't have added a modalhandlers list (introduced in rev 23331, ton) */
 		for(handler= win->modalhandlers.first; handler; handler= handler->next)
-			if(handler->ui_handle)
+			if(handler->ui_handle || handler->op)
 				return NULL;
 		
 		/* to desktop space */





More information about the Bf-blender-cvs mailing list