[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22461] branches/volume25: svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender

Matt Ebb matt at mke3.net
Sat Aug 15 09:40:24 CEST 2009


Revision: 22461
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22461
Author:   broken
Date:     2009-08-15 09:40:22 +0200 (Sat, 15 Aug 2009)

Log Message:
-----------
svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

Modified Paths:
--------------
    branches/volume25/release/ui/buttons_game.py
    branches/volume25/release/ui/buttons_physics_smoke.py
    branches/volume25/release/ui/buttons_scene.py
    branches/volume25/release/ui/buttons_texture.py
    branches/volume25/release/ui/space_info.py
    branches/volume25/release/ui/space_view3d_toolbar.py
    branches/volume25/source/Makefile
    branches/volume25/source/blender/blenkernel/BKE_pointcache.h
    branches/volume25/source/blender/blenkernel/BKE_unit.h
    branches/volume25/source/blender/blenkernel/intern/brush.c
    branches/volume25/source/blender/blenkernel/intern/multires.c
    branches/volume25/source/blender/blenkernel/intern/scene.c
    branches/volume25/source/blender/blenkernel/intern/unit.c
    branches/volume25/source/blender/editors/animation/anim_channels_defines.c
    branches/volume25/source/blender/editors/animation/anim_channels_edit.c
    branches/volume25/source/blender/editors/include/ED_anim_api.h
    branches/volume25/source/blender/editors/interface/interface.c
    branches/volume25/source/blender/editors/object/object_modifier.c
    branches/volume25/source/blender/editors/sculpt_paint/paint_intern.h
    branches/volume25/source/blender/editors/sculpt_paint/paint_ops.c
    branches/volume25/source/blender/editors/sculpt_paint/paint_utils.c
    branches/volume25/source/blender/editors/sculpt_paint/sculpt.c
    branches/volume25/source/blender/editors/space_graph/graph_buttons.c
    branches/volume25/source/blender/editors/space_graph/graph_draw.c
    branches/volume25/source/blender/editors/space_nla/nla_draw.c
    branches/volume25/source/blender/editors/space_outliner/outliner.c
    branches/volume25/source/blender/editors/space_time/space_time.c
    branches/volume25/source/blender/editors/space_time/time_header.c
    branches/volume25/source/blender/editors/space_view3d/drawobject.c
    branches/volume25/source/blender/editors/space_view3d/view3d_draw.c
    branches/volume25/source/blender/editors/space_view3d/view3d_header.c
    branches/volume25/source/blender/editors/transform/transform.c
    branches/volume25/source/blender/makesdna/DNA_brush_types.h
    branches/volume25/source/blender/makesdna/DNA_scene_types.h
    branches/volume25/source/blender/makesdna/DNA_texture_types.h
    branches/volume25/source/blender/makesdna/DNA_userdef_types.h
    branches/volume25/source/blender/makesrna/RNA_access.h
    branches/volume25/source/blender/makesrna/intern/rna_brush.c
    branches/volume25/source/blender/makesrna/intern/rna_constraint.c
    branches/volume25/source/blender/makesrna/intern/rna_scene.c
    branches/volume25/source/blender/makesrna/intern/rna_space.c
    branches/volume25/source/blender/makesrna/intern/rna_texture.c
    branches/volume25/source/blender/makesrna/intern/rna_userdef.c
    branches/volume25/source/nan_definitions.mk

Added Paths:
-----------
    branches/volume25/release/ui/space_time.py

Modified: branches/volume25/release/ui/buttons_game.py
===================================================================
--- branches/volume25/release/ui/buttons_game.py	2009-08-15 05:05:23 UTC (rev 22460)
+++ branches/volume25/release/ui/buttons_game.py	2009-08-15 07:40:22 UTC (rev 22461)
@@ -143,7 +143,8 @@
 	def poll(self, context):
 		ob = context.active_object
 		game = ob.game
-		return (game.physics_type in ('DYNAMIC', 'RIGID_BODY', 'SENSOR', 'SOFT_BODY', 'STATIC'))
+		rd = context.scene.render_data
+		return (game.physics_type in ('DYNAMIC', 'RIGID_BODY', 'SENSOR', 'SOFT_BODY', 'STATIC')) and (rd.engine == 'BLENDER_GAME')
 
 	def draw_header(self, context):
 		layout = self.layout

Modified: branches/volume25/release/ui/buttons_physics_smoke.py
===================================================================
--- branches/volume25/release/ui/buttons_physics_smoke.py	2009-08-15 05:05:23 UTC (rev 22460)
+++ branches/volume25/release/ui/buttons_physics_smoke.py	2009-08-15 07:40:22 UTC (rev 22461)
@@ -41,74 +41,119 @@
 			layout.itemR(md, "smoke_type", expand=True)
 		
 			if md.smoke_type == 'TYPE_DOMAIN':
+				
+				domain = md.domain_settings
+				
 				split = layout.split()
 				
 				col = split.column()
-				col.itemL(text="Behavior:")
-				col.itemR(md.domain_settings, "alpha")
-				col.itemR(md.domain_settings, "beta")
-				
 				col.itemL(text="Resolution:")
-				col.itemR(md.domain_settings, "maxres", text="Low")
-				sub = col.column()
-				sub.active = md.domain_settings.highres
-				sub.itemR(md.domain_settings, "amplify", text="High")
-				col.itemR(md.domain_settings, "highres", text="Use High Resolution")
-				
-				col = split.column()
+				col.itemR(domain, "maxres", text="Divisions")
+
 				col.itemL(text="Display:")
-				col.itemR(md.domain_settings, "visibility")
-				col.itemR(md.domain_settings, "color", slider=True)
+				col.itemR(domain, "visibility", text="Resolution")
+				col.itemR(domain, "color", slider=True)
 				sub = col.column()
-				sub.active = md.domain_settings.highres
-				sub.itemR(md.domain_settings, "viewhighres")
+				sub.active = domain.highres
+				sub.itemR(domain, "viewhighres")
 				
-				layout.itemL(text="Noise Type:")
-				layout.itemR(md.domain_settings, "noise_type", expand=True)
-				
-				split = layout.split()
 				col = split.column()
-				col.itemR(md.domain_settings, "strength")
-				sub = split.column()
-				
-				split = layout.split()
-				col = split.column()
-				col.itemR(md.domain_settings, "dissolve_smoke")
+				col.itemL(text="Behavior:")
+				col.itemR(domain, "alpha")
+				col.itemR(domain, "beta")
+				col.itemR(domain, "dissolve_smoke", text="Dissolve")
 				sub = col.column()
-				sub.active = md.domain_settings.dissolve_smoke
-				sub.itemR(md.domain_settings, "dissolve_speed")
-				sub.itemR(md.domain_settings, "dissolve_smoke_log")
+				sub.active = domain.dissolve_smoke
+				sub.itemR(domain, "dissolve_speed", text="Speed")
+				sub.itemR(domain, "dissolve_smoke_log", text="Slow")
 				
-				split = layout.split()
+			elif md.smoke_type == 'TYPE_FLOW':
 				
-				col = split.column()
-				col.itemL(text="Flow Group:")
-				col.itemR(md.domain_settings, "fluid_group", text="")
+				flow = md.flow_settings
 				
-				#col.itemL(text="Effector Group:")
-				#col.itemR(md.domain_settings, "eff_group", text="")
-				
-				col = split.column()
-				col.itemL(text="Collision Group:")
-				col.itemR(md.domain_settings, "coll_group", text="")
-				
-			elif md.smoke_type == 'TYPE_FLOW':
 				split = layout.split()
 				
 				col = split.column()
-				col.itemR(md.flow_settings, "outflow")
+				col.itemR(flow, "outflow")
 				col.itemL(text="Particle System:")
-				col.item_pointerR(md.flow_settings, "psys", ob, "particle_systems", text="")
+				col.item_pointerR(flow, "psys", ob, "particle_systems", text="")
 				
 				if md.flow_settings.outflow:				
 					col = split.column()
 				else:
 					col = split.column()
 					col.itemL(text="Behavior:")
-					col.itemR(md.flow_settings, "temperature")
-					col.itemR(md.flow_settings, "density")
+					col.itemR(flow, "temperature")
+					col.itemR(flow, "density")
 					
 			#elif md.smoke_type == 'TYPE_COLL':
 			#	layout.itemS()
+			
+class PHYSICS_PT_smoke_highres(PhysicButtonsPanel):
+	__label__ = "Smoke High Resolution"
+	__default_closed__ = True
+	
+	def poll(self, context):
+		md = context.smoke
+		if md:
+				return (md.smoke_type == 'TYPE_DOMAIN')
+		
+		return False
 
-bpy.types.register(PHYSICS_PT_smoke)
\ No newline at end of file
+	def draw_header(self, context):
+		layout = self.layout
+		
+		high = context.smoke.domain_settings
+	
+		layout.itemR(high, "highres", text="")
+		
+	def draw(self, context):
+		layout = self.layout
+		
+		high = context.smoke.domain_settings
+		
+		layout.active = high.highres
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="Resolution:")
+		col.itemR(high, "amplify", text="Divisions")
+		
+		sub = split.column()
+		sub.itemL(text="Noise Method:")
+		sub.row().itemR(high, "noise_type", text="")
+		sub.itemR(high, "strength")
+			
+class PHYSICS_PT_smoke_groups(PhysicButtonsPanel):
+	__label__ = "Smoke Groups"
+	__default_closed__ = True
+	
+	def poll(self, context):
+		md = context.smoke
+		if md:
+				return (md.smoke_type == 'TYPE_DOMAIN')
+		
+		return False
+
+	def draw(self, context):
+		layout = self.layout
+		
+		group = context.smoke.domain_settings
+		
+		split = layout.split()
+		
+		col = split.column()
+		col.itemL(text="Flow Group:")
+		col.itemR(group, "fluid_group", text="")
+				
+		#col.itemL(text="Effector Group:")
+		#col.itemR(group, "eff_group", text="")
+				
+		col = split.column()
+		col.itemL(text="Collision Group:")
+		col.itemR(group, "coll_group", text="")
+
+bpy.types.register(PHYSICS_PT_smoke)
+bpy.types.register(PHYSICS_PT_smoke_highres)
+bpy.types.register(PHYSICS_PT_smoke_groups)
\ No newline at end of file

Modified: branches/volume25/release/ui/buttons_scene.py
===================================================================
--- branches/volume25/release/ui/buttons_scene.py	2009-08-15 05:05:23 UTC (rev 22460)
+++ branches/volume25/release/ui/buttons_scene.py	2009-08-15 07:40:22 UTC (rev 22461)
@@ -428,6 +428,25 @@
 		sub.active = rd.stamp_note
 		sub.itemR(rd, "stamp_note_text", text="")
 
+class SCENE_PT_unit(RenderButtonsPanel):
+	__label__ = "Units"
+	__default_closed__ = True
+	COMPAT_ENGINES = set(['BLENDER_RENDER'])
+
+	def draw(self, context):
+		layout = self.layout
+		
+		unit = context.scene.unit_settings
+		
+		col = layout.column()
+		col.itemR(unit, "system")
+		
+		col = layout.column()
+		col.active = (unit.system != 'NONE')
+		col.itemR(unit, "scale_length")
+		col.itemR(unit, "use_separate")
+
+
 bpy.types.register(SCENE_PT_render)
 bpy.types.register(SCENE_PT_layers)
 bpy.types.register(SCENE_PT_dimensions)
@@ -438,3 +457,4 @@
 bpy.types.register(SCENE_PT_performance)
 bpy.types.register(SCENE_PT_post_processing)
 bpy.types.register(SCENE_PT_stamp)
+bpy.types.register(SCENE_PT_unit)

Modified: branches/volume25/release/ui/buttons_texture.py
===================================================================
--- branches/volume25/release/ui/buttons_texture.py	2009-08-15 05:05:23 UTC (rev 22460)
+++ branches/volume25/release/ui/buttons_texture.py	2009-08-15 07:40:22 UTC (rev 22461)
@@ -137,10 +137,21 @@
 			row.itemR(tex, "y_mapping", text="")
 			row.itemR(tex, "z_mapping", text="")
 
-		row = layout.row()
-		row.column().itemR(tex, "offset")
-		row.column().itemR(tex, "size")
+		if br:
+			layout.itemR(tex, "brush_map_mode", expand=True)
+			
+			row = layout.row()
+			row.active = tex.brush_map_mode in ('FIXED', 'TILED')
+			row.itemR(tex, "angle")
 
+			row = layout.row()
+			row.active = tex.brush_map_mode in ('TILED', '3D')
+			row.column().itemR(tex, "size")
+		else:
+			row = layout.row()
+			row.column().itemR(tex, "offset")
+			row.column().itemR(tex, "size")
+
 class TEXTURE_PT_influence(TextureButtonsPanel):
 	__label__ = "Influence"
 	

Modified: branches/volume25/release/ui/space_info.py
===================================================================
--- branches/volume25/release/ui/space_info.py	2009-08-15 05:05:23 UTC (rev 22460)
+++ branches/volume25/release/ui/space_info.py	2009-08-15 07:40:22 UTC (rev 22461)
@@ -320,17 +320,6 @@
 		sub1.itemS()
 		sub1.itemL(text="Transform:")
 		sub1.itemR(edit, "drag_immediately")
-		sub1.itemS()
-		sub1.itemS()
-		sub1.itemS()
-		
-		sub1.itemL(text="Units:")
-		sub1.itemR(edit, "unit_system")
-		
-		sub2 = sub1.column()
-		sub2.active = (edit.unit_system != 'NONE')
-		sub2.itemR(edit, "unit_scale_length")
-		sub2.itemR(edit, "use_unit_split")
 
 		col = split.column()
 		sub = col.split(percentage=0.85)

Copied: branches/volume25/release/ui/space_time.py (from rev 22450, branches/blender2.5/blender/release/ui/space_time.py)
===================================================================
--- branches/volume25/release/ui/space_time.py	                        (rev 0)
+++ branches/volume25/release/ui/space_time.py	2009-08-15 07:40:22 UTC (rev 22461)
@@ -0,0 +1,109 @@
+
+import bpy
+
+class TIME_HT_header(bpy.types.Header):
+	__space_type__ = "TIMELINE"
+
+	def draw(self, context):
+		layout = self.layout
+		
+		st = context.space_data
+		scene = context.scene
+
+		layout.template_header()
+
+		if context.area.show_menus:
+			row = layout.row()
+			#row.itemM("TIME_MT_view")
+			row.itemM("TIME_MT_frame")
+			row.itemM("TIME_MT_playback")
+
+		layout.itemR(scene, "use_preview_range", text="PR", toggle=True)
+		
+		layout.itemS()
+		
+		row = layout.row(align=True)
+		if not scene.use_preview_range:
+			row.itemR(scene, "start_frame", text="Start")
+			row.itemR(scene, "end_frame", text="End")
+		else:
+			row.itemR(scene, "preview_range_start_frame", text="Start")
+			row.itemR(scene, "preview_range_end_frame", text="End")
+		
+		layout.itemS()
+		layout.itemR(scene, "current_frame")
+		
+		layout.itemS()
+		
+		# XXX: Pause Button
+		row = layout.row(align=True)
+		row.itemO("screen.frame_jump", text="", icon='ICON_REW')
+		row.itemO("screen.keyframe_jump", text="", icon='ICON_PREV_KEYFRAME')
+		row.item_booleanO("screen.animation_play", "reverse", True, text="", icon='ICON_PLAY_REVERSE')
+		row.itemO("screen.animation_play", text="", icon='ICON_PLAY')
+		row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME')
+		row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF')
+

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list