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

[Thomas Dinges]

Revision: 22822
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22822
Author:   dingto
Date:     2009-08-27 21:10:53 +0200 (Thu, 27 Aug 2009)

Log Message:
-----------
2.5:
* Deleted the box layout in logic editor, as discussed in IRC. We need a better solution here, maybe 2 lines?

* Typo in Sequencer RNA. 

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_logic.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c

Modified: branches/blender2.5/blender/release/ui/space_logic.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_logic.py	2009-08-27 18:24:12 UTC (rev 22821)
+++ branches/blender2.5/blender/release/ui/space_logic.py	2009-08-27 19:10:53 UTC (rev 22822)
@@ -11,19 +11,19 @@
 
 	def draw(self, context):
 		layout = self.layout
+		
 		ob = context.active_object
 		game = ob.game
 		
 		layout.itemO("object.game_property_new", text="Add Game Property")
-		
+	
 		for i, prop in enumerate(game.properties):
 		
-			box = layout.box()
-			row = box.row()
-			row.itemR(prop, "name", text="")
-			row.itemR(prop, "type", text="")
-			row.itemR(prop, "value", text="") # we dont care about the type. rna will display correctly
-			row.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO')
+			row = layout.row(align=True) 	 
+			row.itemR(prop, "name", text="") 	 
+			row.itemR(prop, "type", text="") 	 
+			row.itemR(prop, "value", text="", toggle=True) # we dont care about the type. rna will display correctly 	 
+			row.itemR(prop, "debug", text="", toggle=True, icon='ICON_INFO') 	 
 			row.item_intO("object.game_property_remove", "index", i, text="", icon='ICON_X')
 		
 bpy.types.register(LOGIC_PT_properties)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c	2009-08-27 18:24:12 UTC (rev 22821)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c	2009-08-27 19:10:53 UTC (rev 22822)
@@ -360,7 +360,7 @@
 		{SEQ_META, "META", 0, "Meta", ""}, 
 		{SEQ_SCENE, "SCENE", 0, "Scene", ""}, 
 		{SEQ_MOVIE, "MOVIE", 0, "Movie", ""}, 
-		{SEQ_SOUND, "_SOUND", 0, "Sound", ""},
+		{SEQ_SOUND, "SOUND", 0, "Sound", ""},
 		{SEQ_EFFECT, "REPLACE", 0, "Replace", ""}, 
 		{SEQ_CROSS, "CROSS", 0, "Cross", ""}, 
 		{SEQ_ADD, "ADD", 0, "Add", ""},