[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20519] branches/soc-2009-kazanbas: svn merge -r 20373:20515 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender

Arystanbek Dyussenov arystan.d at gmail.com
Sat May 30 15:47:31 CEST 2009


Revision: 20519
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20519
Author:   kazanbas
Date:     2009-05-30 15:47:30 +0200 (Sat, 30 May 2009)

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

Modified Paths:
--------------
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-kazanbas/release/datafiles/blenderbuttons
    branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_curve.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_empty.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_lamp.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_lattice.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_modifier.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_text.py
    branches/soc-2009-kazanbas/release/ui/buttons_material.py
    branches/soc-2009-kazanbas/release/ui/buttons_objects.py
    branches/soc-2009-kazanbas/release/ui/buttons_scene.py
    branches/soc-2009-kazanbas/release/ui/buttons_texture.py
    branches/soc-2009-kazanbas/release/ui/buttons_world.py
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_library.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/library.c
    branches/soc-2009-kazanbas/source/blender/blenlib/BLI_arithb.h
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/arithb.c
    branches/soc-2009-kazanbas/source/blender/blenlib/intern/rct.c
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyframing.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/poselib.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-kazanbas/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_object.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_screen_types.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_interface.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_resources.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_api.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-kazanbas/source/blender/editors/object/editconstraint.c
    branches/soc-2009-kazanbas/source/blender/editors/object/object_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/object/object_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/object/object_modifier.c
    branches/soc-2009-kazanbas/source/blender/editors/object/object_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/area.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-kazanbas/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_info/info_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_text.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_ui.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/WM_types.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_event_types.h

Added Paths:
-----------
    branches/soc-2009-kazanbas/release/ui/buttons_object_constraint.py
    branches/soc-2009-kazanbas/release/ui/buttons_physic_cloth.py
    branches/soc-2009-kazanbas/release/ui/space_outliner.py

Modified: branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj	2009-05-30 12:40:07 UTC (rev 20518)
+++ branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj	2009-05-30 13:47:30 UTC (rev 20519)
@@ -407,6 +407,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\interface\interface_templates.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"
 				>
 			</File>
@@ -639,6 +643,10 @@
 			Name="space_image"
 			>
 			<File
+				RelativePath="..\..\..\source\blender\editors\space_image\image_buttons.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\space_image\image_draw.c"
 				>
 			</File>
@@ -655,10 +663,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\source\blender\editors\space_image\image_panels.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\source\blender\editors\space_image\image_render.c"
 				>
 			</File>

Modified: branches/soc-2009-kazanbas/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)

Modified: branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py	2009-05-30 12:40:07 UTC (rev 20518)
+++ branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py	2009-05-30 13:47:30 UTC (rev 20519)
@@ -1,3 +1,4 @@
+
 import bpy
  
 class DataButtonsPanel(bpy.types.Panel):
@@ -17,13 +18,11 @@
 		arm = context.active_object.data
 		layout = self.layout
 		
-		row = layout.row()
-		row.itemR(arm, "rest_position")
+		layout.itemR(arm, "rest_position")
 
 		split = layout.split()
 
 		sub = split.column()
-
 		sub.itemL(text="Deform:")
 		sub.itemR(arm, "deform_vertexgroups", text="Vertes Groups")
 		sub.itemR(arm, "deform_envelope", text="Envelopes")
@@ -38,7 +37,6 @@
 		#sub.itemR(arm, "layer")
 		#sub.itemR(arm, "layer_protection")
 
-
 class DATA_PT_display(DataButtonsPanel):
 	__idname__ = "DATA_PT_display"
 	__label__ = "Display"
@@ -59,7 +57,6 @@
 		sub.itemR(arm, "draw_custom_bone_shapes", text="Shapes")
 		sub.itemR(arm, "draw_group_colors", text="Colors")
 
-
 class DATA_PT_paths(DataButtonsPanel):
 	__idname__ = "DATA_PT_paths"
 	__label__ = "Paths"
@@ -71,11 +68,10 @@
 		split = layout.split()
 		
 		sub = split.column()
-
 		sub.itemR(arm, "paths_show_around_current_frame", text="Around Frame")
 		if (arm.paths_show_around_current_frame):
-				sub.itemR(arm, "path_before_current", text="Before")
-				sub.itemR(arm, "path_after_current", text="After")
+			sub.itemR(arm, "path_before_current", text="Before")
+			sub.itemR(arm, "path_after_current", text="After")
 		else:
 			sub.itemR(arm, "path_start_frame", text="Start")
 			sub.itemR(arm, "path_end_frame", text="End")
@@ -89,7 +85,6 @@
 		sub.itemR(arm, "paths_highlight_keyframes", text="Keyframes")
 		sub.itemR(arm, "paths_show_keyframe_numbers", text="Keyframe Numbers")
 
-		
 class DATA_PT_ghost(DataButtonsPanel):
 	__idname__ = "DATA_PT_ghost"
 	__label__ = "Ghost"
@@ -101,7 +96,6 @@
 		split = layout.split()
 
 		sub = split.column()
-
 		sub.itemR(arm, "ghost_type", text="Scope")
 		if arm.ghost_type == 'RANGE':
 			sub.itemR(arm, "ghost_start_frame", text="Start")
@@ -112,10 +106,9 @@
 			sub.itemR(arm, "ghost_size", text="Step")
 
 		sub = split.column()
-
 		sub.itemR(arm, "ghost_only_selected", text="Selected Only")
 
 bpy.types.register(DATA_PT_skeleton)
 bpy.types.register(DATA_PT_display)
 bpy.types.register(DATA_PT_paths)
-bpy.types.register(DATA_PT_ghost)
+bpy.types.register(DATA_PT_ghost)
\ No newline at end of file

Modified: branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py	2009-05-30 12:40:07 UTC (rev 20518)
+++ branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py	2009-05-30 13:47:30 UTC (rev 20519)
@@ -1,7 +1,7 @@
 
 import bpy
  
-class DataButtonsPanel(bpy.types.Panel):
+class BoneButtonsPanel(bpy.types.Panel):
 	__space_type__ = "BUTTONS_WINDOW"
 	__region_type__ = "WINDOW"
 	__context__ = "bone"
@@ -10,12 +10,12 @@
 		ob = context.active_object
 		return (ob and ob.type == 'ARMATURE')
 
-class DATA_PT_bone(DataButtonsPanel):
-	__idname__ = "DATA_PT_bone"
+class BONE_PT_bone(BoneButtonsPanel):
+	__idname__ = "BONE_PT_bone"
 	__label__ = "Bone"
 
 	def draw(self, context):
-		bone = context.main.armatures[0].bones[0]
+		bone = context.active_object.data.bones[0]
 		layout = self.layout
 
 		split = layout.split()
@@ -26,7 +26,6 @@
 		sub.itemR(bone, "connected")
 		sub.itemR(bone, "deform")
 
-				
 		sub.itemL(text="Inherit:")
 		sub.itemR(bone, "hinge")
 		sub.itemR(bone, "inherit_scale")
@@ -48,20 +47,7 @@
 		sub.itemR(bone, "bbone_in", text="Ease In")
 		sub.itemR(bone, "bbone_out", text="Ease Out")
 		
-		
 		sub.itemR(bone, "cyclic_offset")
 
+bpy.types.register(BONE_PT_bone)
 
-class DATA_PT_constraints(DataButtonsPanel):
-	__idname__ = "DATA_PT_constraints"
-	__label__ = "Constraints"
-	
-	def draw(self, context):
-		bone = context.main.armatures[0].bones[0]
-		layout = self.layout
-		split = layout.split()
-		
-		sub = split.column()
-
-bpy.types.register(DATA_PT_bone)
-bpy.types.register(DATA_PT_constraints)

Modified: branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py	2009-05-30 12:40:07 UTC (rev 20518)
+++ branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py	2009-05-30 13:47:30 UTC (rev 20519)
@@ -18,19 +18,16 @@
 		cam = context.active_object.data
 		layout = self.layout
 
-		if not cam:
-			return
-		
 		layout.itemR(cam, "type", expand=True)
 		
 		row = layout.row(align=True)
 		if cam.type == 'PERSP':
+			row.itemR(cam, "lens_unit", text="")
 			if cam.lens_unit == 'MILLIMETERS':
 				row.itemR(cam, "lens", text="Angle")
 			elif cam.lens_unit == 'DEGREES':
 				row.itemR(cam, "angle")
 
-			row.itemR(cam, "lens_unit", text="")
 		elif cam.type == 'ORTHO':
 			row.itemR(cam, "ortho_scale")
 			
@@ -58,9 +55,6 @@
 		cam = context.active_object.data
 		layout = self.layout
 
-		if not cam:
-			return
-			
 		split = layout.split()
 		
 		sub = split.column()
@@ -69,13 +63,12 @@
 		sub.itemR(cam, "show_title_safe", text="Title Safe")
 		sub.itemR(cam, "show_name", text="Name")
 			
-		sub = split.column()
-		sub.itemR(cam, "show_passepartout", text="Passepartout")
-		if (cam.show_passepartout):
-			sub.itemR(cam, "passepartout_alpha", text="Alpha", slider=True)
-		sub.itemR(cam, "draw_size", text="Size")
+		col = split.column()
+		col.itemR(cam, "show_passepartout", text="Passepartout")
+		colsub = col.column()
+		colsub.active = cam.show_passepartout
+		colsub.itemR(cam, "passepartout_alpha", text="Alpha", slider=True)
+		col.itemR(cam, "draw_size", text="Size")
 		
 bpy.types.register(DATA_PT_cameralens)
-bpy.types.register(DATA_PT_cameradisplay)
-
-
+bpy.types.register(DATA_PT_cameradisplay)
\ No newline at end of file

Modified: branches/soc-2009-kazanbas/release/ui/buttons_data_curve.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/buttons_data_curve.py	2009-05-30 12:40:07 UTC (rev 20518)
+++ branches/soc-2009-kazanbas/release/ui/buttons_data_curve.py	2009-05-30 13:47:30 UTC (rev 20519)
@@ -9,31 +9,29 @@
 	def poll(self, context):
 		ob = context.active_object
 		return (ob and ob.type == 'CURVE')
-	
 
 class DATA_PT_shape_curve(DataButtonsPanel):
 		__idname__ = "DATA_PT_shape_curve"
 		__label__ = "Shape"
 
 		def draw(self, context):
-			curve = context.main.curves[0]
+			curve = context.active_object.data
 			layout = self.layout
 
-			if not curve:
-				return
-			row = layout.row()
-			row.itemR(curve, "curve_2d")			
+			layout.itemR(curve, "curve_2d")			
 							
 			split = layout.split()
 		
-			sub = split.column()
-			sub.itemL(text="Caps:")
-			sub.itemR(curve, "front")
-			sub.itemR(curve, "back")
+			col = split.column()
+			colsub = col.column()
+			colsub.active = curve.curve_2d
+			colsub.itemL(text="Caps:")
+			colsub.itemR(curve, "front")
+			colsub.itemR(curve, "back")
 			
-			sub.itemL(text="Textures:")
-			sub.itemR(curve, "uv_orco")
-			sub.itemR(curve, "auto_texspace")
+			col.itemL(text="Textures:")
+			col.itemR(curve, "uv_orco")
+			col.itemR(curve, "auto_texspace")
 			
 			sub = split.column()	
 			sub.itemL(text="Resolution:")
@@ -47,19 +45,14 @@
 			sub.itemL(text="NORMALS")
 			sub.itemR(curve, "vertex_normal_flip")
 
-
 class DATA_PT_geometry(DataButtonsPanel):
 		__idname__ = "DATA_PT_geometry"
 		__label__ = "Geometry"
 
 		def draw(self, context):
-			curve = context.main.curves[0]
+			curve = context.active_object.data
 			layout = self.layout
 
-			if not curve:
-				return
-				
-				
 			split = layout.split()
 		
 			sub = split.column()
@@ -67,33 +60,30 @@
 			sub.itemR(curve, "width")
 			sub.itemR(curve, "extrude")
 			sub.itemR(curve, "taper_object")
+			
 			sub = split.column()
 			sub.itemL(text="Bevel:")
 			sub.itemR(curve, "bevel_depth", text="Depth")
 			sub.itemR(curve, "bevel_resolution", text="Resolution")
 			sub.itemR(curve, "bevel_object")
-
-
-
 	
 class DATA_PT_pathanim(DataButtonsPanel):
 		__idname__ = "DATA_PT_pathanim"
 		__label__ = "Path Animation"
+		
+		def draw_header(self, context):
+			curve = context.active_object.data
 
-		def draw(self, context):
-			curve = context.main.curves[0]
 			layout = self.layout
+			layout.itemR(curve, "path", text="")
 
-			if not curve:
-				return
-				
-				
-			split = layout.split()		
-			sub = split.column(1)
-			sub.itemR(curve, "path", text="Enable")
-
+		def draw(self, context):
+			curve = context.active_object.data
+			layout = self.layout
+			layout.active = curve.path	
 			
 			split = layout.split()		
+			
 			sub = split.column()
 			sub.itemR(curve, "path_length", text="Frames")
 			sub.itemR(curve, "follow")
@@ -101,19 +91,15 @@
 			sub = split.column()
 			sub.itemR(curve, "stretch")
 			sub.itemR(curve, "offset_path_distance", text="Offset Children")
-
-			
+	
 class DATA_PT_current_curve(DataButtonsPanel):
 		__idname__ = "DATA_PT_current_curve"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list