Revision: 21868
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21868
Author: ben2610
Date: 2009-07-24 23:12:01 +0200 (Fri, 24 Jul 2009)
Log Message:
-----------
svn merge -r 21848:21866
https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/release/ui/space_image.py
branches/itasc/release/ui/space_info.py
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/animation/anim_channels.c
branches/itasc/source/blender/editors/animation/anim_filter.c
branches/itasc/source/blender/editors/armature/armature_intern.h
branches/itasc/source/blender/editors/armature/armature_ops.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/armature/poseobject.c
branches/itasc/source/blender/editors/include/ED_anim_api.h
branches/itasc/source/blender/editors/include/ED_armature.h
branches/itasc/source/blender/editors/include/ED_screen.h
branches/itasc/source/blender/editors/interface/interface_widgets.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/screen/screen_edit.c
branches/itasc/source/blender/editors/screen/screen_intern.h
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/space_action/action_draw.c
branches/itasc/source/blender/editors/space_action/action_header.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_buttons/buttons_header.c
branches/itasc/source/blender/editors/space_buttons/space_buttons.c
branches/itasc/source/blender/editors/space_graph/graph_draw.c
branches/itasc/source/blender/editors/space_graph/graph_header.c
branches/itasc/source/blender/editors/space_image/image_draw.c
branches/itasc/source/blender/editors/space_nla/nla_channels.c
branches/itasc/source/blender/editors/space_nla/nla_draw.c
branches/itasc/source/blender/editors/space_nla/nla_edit.c
branches/itasc/source/blender/editors/space_nla/nla_header.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_time/time_header.c
branches/itasc/source/blender/editors/space_view3d/drawarmature.c
branches/itasc/source/blender/editors/space_view3d/view3d_header.c
branches/itasc/source/blender/makesdna/DNA_action_types.h
branches/itasc/source/blender/makesdna/DNA_object_types.h
branches/itasc/source/blender/makesdna/DNA_particle_types.h
branches/itasc/source/blender/makesdna/DNA_screen_types.h
branches/itasc/source/blender/makesdna/DNA_space_types.h
branches/itasc/source/blender/makesrna/RNA_types.h
branches/itasc/source/blender/makesrna/intern/rna_access.c
branches/itasc/source/blender/makesrna/intern/rna_armature.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/windowmanager/WM_api.h
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/blender/windowmanager/intern/wm_files.c
branches/itasc/source/blender/windowmanager/intern/wm_jobs.c
branches/itasc/source/blender/windowmanager/intern/wm_window.c
branches/itasc/source/blender/windowmanager/wm.h
branches/itasc/source/blender/windowmanager/wm_window.h
Modified: branches/itasc/release/ui/space_image.py
===================================================================
--- branches/itasc/release/ui/space_image.py 2009-07-24 21:01:41 UTC (rev
21867)
+++ branches/itasc/release/ui/space_image.py 2009-07-24 21:12:01 UTC (rev
21868)
@@ -32,7 +32,7 @@
for a, b in ratios:
text = "Zoom %d:%d" % (a, b)
- layout.item_floatO("image.view_zoom_ratio", "ratio",
a/b, text=text)
+ layout.item_floatO("image.view_zoom_ratio", "ratio",
a/float(b), text=text)
layout.itemS()
@@ -225,34 +225,6 @@
layout.template_ID(sima, "image", new="image.new")
- """
- /* image select */
-
- pinflag= (show_render)? 0: UI_ID_PIN;
- xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL,
(ID*)sima->image, ID_IM, &sima->pin, xco, yco,
- sima_idpoin_handle,
UI_ID_BROWSE|UI_ID_BROWSE_RENDER|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|pinflag);
- xco += 8;
- """
-
- """
- if(ima && !ELEM3(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE,
IMA_SRC_VIEWER) && ima->ok) {
- /* XXX this should not be a static var */
- static int headerbuttons_packdummy;
-
- headerbuttons_packdummy = 0;
-
- if (ima->packedfile) {
- headerbuttons_packdummy = 1;
- }
- if (ima->packedfile && ibuf && (ibuf->userflags &
IB_BITMAPDIRTY))
- uiDefIconButBitI(block, TOG, 1, 0 /* XXX
B_SIMA_REPACK */, ICON_UGLYPACKAGE, xco,yco,XIC,YIC,
&headerbuttons_packdummy, 0, 0, 0, 0, "Re-Pack this image as PNG");
- else
- uiDefIconButBitI(block, TOG, 1, 0 /* XXX
B_SIMAPACKIMA */, ICON_PACKAGE, xco,yco,XIC,YIC,
&headerbuttons_packdummy, 0, 0, 0, 0, "Pack/Unpack this image");
-
- xco+= XIC+8;
- }
- """
-
# uv editing
if show_uvedit:
uvedit = sima.uv_editor
@@ -294,7 +266,8 @@
if ima.type == "COMPOSITE" and ima.source in ("MOVIE",
"SEQUENCE"):
row.itemO("image.play_composite",
icon="ICON_PLAY")
- layout.itemR(sima, "update_automatically", text="")
+ if show_uvedit or sima.image_painting:
+ layout.itemR(sima, "update_automatically", text="")
class IMAGE_PT_game_properties(bpy.types.Panel):
__space_type__ = "IMAGE_EDITOR"
Modified: branches/itasc/release/ui/space_info.py
===================================================================
--- branches/itasc/release/ui/space_info.py 2009-07-24 21:01:41 UTC (rev
21867)
+++ branches/itasc/release/ui/space_info.py 2009-07-24 21:12:01 UTC (rev
21868)
@@ -53,6 +53,7 @@
layout.itemO("wm.save_mainfile", text="Save")
layout.operator_context = "INVOKE_AREA"
layout.itemO("wm.save_as_mainfile", text="Save As...")
+ layout.itemO("screen.userpref_show", text="User Preferences...")
layout.itemS()
@@ -194,7 +195,7 @@
split = layout.split()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Display:")
colsplitcol.itemR(view, "tooltips")
@@ -219,7 +220,7 @@
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="View Manipulation:")
colsplitcol.itemR(view, "auto_depth")
@@ -240,7 +241,7 @@
colsplitcol.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Mouse Buttons:")
colsplitcol.itemR(view, "left_mouse_button_select")
@@ -263,7 +264,7 @@
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
#manipulator
colsplitcol.itemR(view, "use_manipulator")
@@ -300,7 +301,7 @@
split = layout.split()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Materials:")
@@ -321,7 +322,7 @@
colsplitcol.itemR(edit, "drag_immediately")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Snap:")
colsplitcol.itemR(edit, "snap_translate", text="Translate")
@@ -340,7 +341,7 @@
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Keyframing:")
@@ -366,7 +367,7 @@
colsplitcol.itemS()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Duplicate:")
colsplitcol.itemR(edit, "duplicate_mesh", text="Mesh")
@@ -398,7 +399,7 @@
split = layout.split()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemR(system, "emulate_numpad")
colsplitcol.itemS()
@@ -406,7 +407,10 @@
#Weight Colors
colsplitcol.itemL(text="Weight Colors:")
colsplitcol.itemR(system, "use_weight_color_range", text="Use
Custom Range")
- colsplitcol.itemR(system, "weight_color_range")
+
+ colsub = colsplitcol.column()
+ colsub.active = system.use_weight_color_range
+ colsub.template_color_ramp(system.weight_color_range,
expand=True)
colsplitcol.itemS()
colsplitcol.itemS()
@@ -416,7 +420,7 @@
colsplitcol.itemR(system, "memory_cache_limit")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
#System
colsplitcol.itemL(text="System:")
@@ -430,7 +434,7 @@
colsplitcol.itemR(system, "audio_mixing_buffer")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
#OpenGL
colsplitcol.itemL(text="OpenGL:")
@@ -440,7 +444,7 @@
row = colsplitcol.row()
row.itemR(system, "window_draw_method", expand=True)
colsplitcol.itemL(text="Textures:")
- colsplitcol.itemR(system, "gl_texture_limit", text="Limit")
+ colsplitcol.itemR(system, "gl_texture_limit", text="Limit Size")
colsplitcol.itemR(system, "texture_time_out", text="Time Out")
colsplitcol.itemR(system, "texture_collection_rate",
text="Collection Rate")
@@ -460,46 +464,48 @@
split = layout.split()
col = split.column()
- col.itemR(paths, "use_relative_paths")
- col.itemR(paths, "compress_file")
- col.itemR(paths, "fonts_directory")
- col.itemR(paths, "textures_directory")
- col.itemR(paths, "texture_plugin_directory")
- col.itemR(paths, "sequence_plugin_directory")
- col.itemR(paths, "render_output_directory")
- col.itemR(paths, "python_scripts_directory")
- col.itemR(paths, "sounds_directory")
- col.itemR(paths, "temporary_directory")
-
-class INFO_PT_autosave(bpy.types.Panel):
- __space_type__ = "USER_PREFERENCES"
- __label__ = "Auto Save"
- __no_header__ = True
-
- def poll(self, context):
- userpref = context.user_preferences
- return (userpref.active_section == 'AUTO_SAVE')
-
- def draw(self, context):
- layout = self.layout
- userpref = context.user_preferences
- save = userpref.autosave
+ col.itemL(text="File Paths:")
+ splitcol = col.split(percentage=0.3)
- split = layout.split()
- col = split.column()
- colsplit = col.split(percentage=0.8)
- colsplitcol = colsplit.column()
- colsplitcol.itemR(save, "save_version")
- colsplitcol.itemR(save, "recent_files")
- colsplitcol.itemR(save, "save_preview_images")
+ splitcol.itemL(text="Fonts:")
+ splitcol.itemR(paths, "fonts_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Textures:")
+ splitcol.itemR(paths, "textures_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Texture Plugins:")
+ splitcol.itemR(paths, "texture_plugin_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Sequence Plugins:")
+ splitcol.itemR(paths, "sequence_plugin_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Render Output:")
+ splitcol.itemR(paths, "render_output_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Scripts:")
+ splitcol.itemR(paths, "python_scripts_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Sounds:")
+ splitcol.itemR(paths, "sounds_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Temp:")
+ splitcol.itemR(paths, "temporary_directory", text="")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.2)
colsplitcol = colsplit.column()
- colsplitcol.itemR(save, "auto_save_temporary_files")
+ colsplitcol = colsplit.column()
+ colsplitcol.itemL(text="Save & Load:")
+ colsplitcol.itemR(paths, "use_relative_paths")
+ colsplitcol.itemR(paths, "compress_file")
+ colsplitcol.itemL(text="Auto Save:")
+ colsplitcol.itemR(paths, "save_version")
+ colsplitcol.itemR(paths, "recent_files")
+ colsplitcol.itemR(paths, "save_preview_images")
+ colsplitcol.itemR(paths, "auto_save_temporary_files")
colsub = colsplitcol.column()
- colsub.enabled = save.auto_save_temporary_files
- colsub.itemR(save, "auto_save_time")
+ colsub.enabled = paths.auto_save_temporary_files
+ colsub.itemR(paths, "auto_save_time")
class INFO_PT_language(bpy.types.Panel):
__space_type__ = "USER_PREFERENCES"
@@ -535,6 +541,7 @@
split = layout.split(percentage=0.8)
split.itemL(text="")
+ layout.operator_context = "EXEC_AREA"
split.itemO("wm.save_homefile", text="Save As Default")
bpy.types.register(INFO_HT_header)
@@ -551,7 +558,6 @@
bpy.types.register(INFO_PT_edit)
bpy.types.register(INFO_PT_system)
bpy.types.register(INFO_PT_filepaths)
-bpy.types.register(INFO_PT_autosave)
bpy.types.register(INFO_PT_language)
bpy.types.register(INFO_PT_bottombar)
Modified: branches/itasc/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/itasc/source/blender/blenloader/intern/readfile.c 2009-07-24
21:01:41 UTC (rev 21867)
+++ branches/itasc/source/blender/blenloader/intern/readfile.c 2009-07-24
21:12:01 UTC (rev 21868)
@@ -4353,9 +4353,10 @@
}
else if(sl->spacetype==SPACE_BUTS) {
SpaceButs *sbuts= (SpaceButs
*)sl;
- sbuts->lockpoin= NULL;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
