Revision: 21097
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21097
Author: blendix
Date: 2009-06-23 02:45:41 +0200 (Tue, 23 Jun 2009)
Log Message:
-----------
2.5: Image Editor
* Menu and header more complete now.
* Clean up Game Properties panel and moved View Properties panel
to python.
* Fix some drawing issues when combining tiles, repeat and aspect,
some also from 2.4x, these options didn't work together 100%.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_image.py
branches/blender2.5/blender/source/blender/editors/include/UI_icons.h
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ui_api.c
Modified: branches/blender2.5/blender/release/ui/space_image.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_image.py 2009-06-23
00:41:55 UTC (rev 21096)
+++ branches/blender2.5/blender/release/ui/space_image.py 2009-06-23
00:45:41 UTC (rev 21097)
@@ -9,6 +9,7 @@
layout = self.layout
sima = context.space_data
uv = sima.uv_editor
+ settings = context.scene.tool_settings
show_uvedit = sima.show_uvedit
@@ -17,8 +18,8 @@
layout.itemS()
layout.itemR(sima, "update_automatically")
- # XXX if show_uvedit:
- # XXX layout.itemR(uv, "local_view") # "UV Local View",
Numpad /
+ if show_uvedit:
+ layout.itemR(settings, "uv_local_view") # Numpad /
layout.itemS()
@@ -156,7 +157,7 @@
layout = self.layout
sima = context.space_data
uv = sima.uv_editor
- scene = context.scene
+ settings = context.scene.tool_settings
layout.itemR(uv, "snap_to_pixels")
layout.itemR(uv, "constrain_to_image_bounds")
@@ -183,8 +184,8 @@
layout.itemS()
- # XXX layout.itemR(scene, "proportional_editing")
- layout.item_menu_enumR(scene, "proportional_editing_falloff")
+ layout.itemR(settings, "proportional_editing")
+ layout.item_menu_enumR(settings, "proportional_editing_falloff")
layout.itemS()
@@ -196,7 +197,9 @@
def draw(self, context):
sima = context.space_data
ima = sima.image
+ iuser = sima.image_user
layout = self.layout
+ settings = context.scene.tool_settings
show_render = sima.show_render
show_paint = sima.show_paint
@@ -250,75 +253,26 @@
# uv editing
if show_uvedit:
- pass
-
- """
- /* uv editing */
- if(show_uvedit) {
- /* pivot */
- uiDefIconTextButS(block, ICONTEXTROW, B_NOP,
ICON_ROTATE,
- "Pivot: %t|Bounding Box Center
%x0|Median Point %x3|2D Cursor %x1",
- xco,yco,XIC+10,YIC, &ar->v2d.around, 0,
3.0, 0, 0,
- "Rotation/Scaling Pivot (Hotkeys:
Comma, Shift Comma, Period)");
- xco+= XIC + 18;
-
- /* selection modes */
- uiDefIconButBitS(block, TOG, UV_SYNC_SELECTION, B_REDR,
ICON_EDIT, xco,yco,XIC,YIC, &scene->toolsettings->uv_flag, 0, 0, 0, 0, "Sync UV
and Mesh Selection");
- xco+= XIC+8;
+ uvedit = sima.uv_editor
- if(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) {
- uiBlockBeginAlign(block);
-
- uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX,
B_REDR, ICON_VERTEXSEL,
- xco,yco,XIC,YIC, &scene->selectmode,
1.0, 0.0, 0, 0, "Vertex select mode");
- uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE,
B_REDR, ICON_EDGESEL,
- xco+=XIC,yco,XIC,YIC,
&scene->selectmode, 1.0, 0.0, 0, 0, "Edge select mode");
- uiDefIconButBitS(block, TOG, SCE_SELECT_FACE,
B_REDR, ICON_FACESEL,
- xco+=XIC,yco,XIC,YIC,
&scene->selectmode, 1.0, 0.0, 0, 0, "Face select mode");
+ layout.itemS()
- uiBlockEndAlign(block);
- }
- else {
- uiBlockBeginAlign(block);
+ layout.itemR(uvedit, "pivot", text="")
+ layout.itemR(settings, "uv_sync_selection", text="")
- uiDefIconButS(block, ROW, B_REDR,
ICON_VERTEXSEL,
- xco,yco,XIC,YIC,
&scene->toolsettings->uv_selectmode, 1.0, UV_SELECT_VERTEX, 0, 0, "Vertex
select mode");
- uiDefIconButS(block, ROW, B_REDR, ICON_EDGESEL,
- xco+=XIC,yco,XIC,YIC,
&scene->toolsettings->uv_selectmode, 1.0, UV_SELECT_EDGE, 0, 0, "Edge select
mode");
- uiDefIconButS(block, ROW, B_REDR, ICON_FACESEL,
- xco+=XIC,yco,XIC,YIC,
&scene->toolsettings->uv_selectmode, 1.0, UV_SELECT_FACE, 0, 0, "Face select
mode");
- uiDefIconButS(block, ROW, B_REDR,
ICON_LINKEDSEL,
- xco+=XIC,yco,XIC,YIC,
&scene->toolsettings->uv_selectmode, 1.0, UV_SELECT_ISLAND, 0, 0, "Island
select mode");
+ if settings.uv_sync_selection:
+ layout.itemR(settings, "mesh_selection_mode",
text="", expand=True)
+ else:
+ layout.itemR(settings, "uv_selection_mode",
text="", expand=True)
+ layout.itemR(uvedit, "sticky_selection_mode",
text="")
+ pass
- uiBlockEndAlign(block);
+ row = layout.row(align=True)
+ row.itemR(settings, "snap", text="")
+ if settings.snap:
+ row.itemR(settings, "snap_mode", text="")
- /* would use these if const's could go in
strings
- * SI_STICKY_LOC SI_STICKY_DISABLE
SI_STICKY_VERTEX */
- but = uiDefIconTextButC(block, ICONTEXTROW,
B_REDR, ICON_STICKY_UVS_LOC,
- "Sticky UV Selection:
%t|Disable%x1|Shared Location%x0|Shared Vertex%x2",
- xco+=XIC+10,yco,XIC+10,YIC,
&(sima->sticky), 0, 3.0, 0, 0,
- "Sticky UV Selection (Hotkeys:
Shift C, Alt C, Ctrl C)");
- }
-
- xco+= XIC + 16;
-
- /* snap options, identical to options in 3d view header
*/
- uiBlockBeginAlign(block);
-
- if (scene->snap_flag & SCE_SNAP) {
- uiDefIconButBitS(block, TOG, SCE_SNAP, B_REDR,
ICON_SNAP_GEO,xco,yco,XIC,YIC, &scene->snap_flag, 0, 0, 0, 0, "Use Snap or Grid
(Shift Tab).");
- xco+= XIC;
- uiDefButS(block, MENU, B_NOP,
"Mode%t|Closest%x0|Center%x1|Median%x2",xco,yco,70,YIC, &scene->snap_target, 0,
0, 0, 0, "Snap Target Mode.");
- xco+= 70;
- }
- else {
- uiDefIconButBitS(block, TOG, SCE_SNAP, B_REDR,
ICON_SNAP_GEAR,xco,yco,XIC,YIC, &scene->snap_flag, 0, 0, 0, 0, "Snap while Ctrl
is held during transform (Shift Tab).");
- xco+= XIC;
- }
-
- uiBlockEndAlign(block);
- xco+= 8;
-
+ """
/* uv layers */
{
Object *obedit= CTX_data_edit_object(C);
@@ -329,29 +283,11 @@
but = uiDefButI(block, MENU, B_NOP, menustr
,xco,yco,85,YIC, &act, 0, 0, 0, 0, "Active UV Layer for editing.");
// uiButSetFunc(but,
do_image_buttons_set_uvlayer_callback, &act, NULL);
-
- xco+= 85;
- }
+ """
- xco+= 8;
- }
- """
-
if ima:
- """
- RenderResult *rr;
-
- /* render layers and passes */
- rr= BKE_image_get_renderresult(scene, ima);
- if(rr) {
- uiBlockBeginAlign(block);
-#if 0
- uiblock_layer_pass_buttons(block, rr,
&sima->iuser, B_REDR, xco, 0, 160);
-#endif
- uiBlockEndAlign(block);
- xco+= 166;
- }
- """
+ # layers
+ layout.template_image_layers(ima, iuser)
# painting
layout.itemR(sima, "image_painting", text="")
@@ -373,6 +309,10 @@
__region_type__ = "UI"
__label__ = "Game Properties"
+ def poll(self, context):
+ sima = context.space_data
+ return (sima and sima.image)
+
def draw(self, context):
sima = context.space_data
layout = self.layout
@@ -382,447 +322,84 @@
if ima:
split = layout.split()
- col = split.column(align=True)
- col.itemR(ima, "animated")
+ col = split.column()
- subcol = col.column()
+ subcol = col.column(align=True)
+ subcol.itemR(ima, "clamp_x")
+ subcol.itemR(ima, "clamp_y")
+
+ col.itemR(ima, "mapping", expand=True)
+ col.itemR(ima, "tiles")
+
+ col = split.column()
+
+ subcol = col.column(align=True)
+ subcol.itemR(ima, "animated")
+
+ subcol = subcol.column()
subcol.itemR(ima, "animation_start", text="Start")
subcol.itemR(ima, "animation_end", text="End")
subcol.itemR(ima, "animation_speed", text="Speed")
subcol.active = ima.animated
- col = split.column()
- col.itemR(ima, "tiles")
-
subrow = col.row(align=True)
subrow.itemR(ima, "tiles_x", text="X")
subrow.itemR(ima, "tiles_y", text="Y")
- subrow.active = ima.tiles
+ subrow.active = ima.tiles or ima.animated
- col.itemS()
- col.itemR(ima, "clamp_x")
- col.itemR(ima, "clamp_y")
-
- col.itemR(ima, "mapping", expand=True)
-
-bpy.types.register(IMAGE_MT_view)
-bpy.types.register(IMAGE_MT_select)
-bpy.types.register(IMAGE_MT_image)
-bpy.types.register(IMAGE_MT_uvs_showhide)
-bpy.types.register(IMAGE_MT_uvs_transform)
-bpy.types.register(IMAGE_MT_uvs_mirror)
-bpy.types.register(IMAGE_MT_uvs_weldalign)
-bpy.types.register(IMAGE_MT_uvs)
-bpy.types.register(IMAGE_HT_header)
-bpy.types.register(IMAGE_PT_game_properties)
-
-
-import bpy
-
-class IMAGE_MT_view(bpy.types.Menu):
+class IMAGE_PT_view_properties(bpy.types.Panel):
__space_type__ = "IMAGE_EDITOR"
- __label__ = "View"
+ __region_type__ = "UI"
+ __label__ = "View Properties"
def draw(self, context):
- layout = self.layout
sima = context.space_data
- uv = sima.uv_editor
-
- show_uvedit = sima.show_uvedit
-
- layout.itemO("IMAGE_OT_properties") # icon
-
- layout.itemS()
-
- layout.itemR(sima, "update_automatically")
- # XXX if show_uvedit:
- # XXX layout.itemR(uv, "local_view") # "UV Local View",
Numpad /
-
- layout.itemS()
-
- layout.itemO("IMAGE_OT_view_zoom_in")
- layout.itemO("IMAGE_OT_view_zoom_out")
-
- layout.itemS()
-
- ratios = [[1, 8], [1, 4], [1, 2], [1, 1], [2, 1], [4, 1], [8,
1]];
-
- for a, b in ratios:
- text = "Zoom %d:%d" % (a, b)
- layout.item_floatO("IMAGE_OT_view_zoom_ratio", "ratio",
a/b, text=text)
-
- layout.itemS()
-
- if show_uvedit:
- layout.itemO("IMAGE_OT_view_selected")
-
- layout.itemO("IMAGE_OT_view_all")
- layout.itemO("SCREEN_OT_screen_full_area")
-
-class IMAGE_MT_select(bpy.types.Menu):
- __space_type__ = "IMAGE_EDITOR"
- __label__ = "Select"
-
- def draw(self, context):
layout = self.layout
- layout.itemO("UV_OT_select_border")
- layout.item_booleanO("UV_OT_select_border", "pinned", True)
-
- layout.itemS()
-
- layout.itemO("UV_OT_select_all_toggle")
- layout.itemO("UV_OT_select_invert")
- layout.itemO("UV_OT_unlink_selection")
-
- layout.itemS()
-
- layout.itemO("UV_OT_select_pinned")
- layout.itemO("UV_OT_select_linked")
-
-class IMAGE_MT_image(bpy.types.Menu):
- __space_type__ = "IMAGE_EDITOR"
- __label__ = "Image"
-
- def draw(self, context):
- layout = self.layout
- sima = context.space_data
ima = sima.image
+ show_uvedit = sima.show_uvedit
+ uvedit = sima.uv_editor
- layout.itemO("IMAGE_OT_new")
- layout.itemO("IMAGE_OT_open")
+ split = layout.split()
- show_render = sima.show_render
-
+ col = split.column()
if ima:
- if show_render:
- layout.itemO("IMAGE_OT_replace")
- layout.itemO("IMAGE_OT_reload")
+ col.itemR(ima, "display_aspect")
- layout.itemO("IMAGE_OT_save")
- layout.itemO("IMAGE_OT_save_as")
+ col = split.column()
+ col.itemR(sima, "draw_repeated", text="Repeat")
+ if show_uvedit:
+ col.itemR(uvedit, "normalized_coordinates")
- if ima.source == "SEQUENCE":
- layout.itemO("IMAGE_OT_save_sequence")
+ if show_uvedit:
+ col = layout.column()
+ row = col.row()
+ row.itemR(uvedit, "edge_draw_type", expand=True)
+ row = col.row()
+ row.itemR(uvedit, "draw_smooth_edges", text="Smooth")
+ row.itemR(uvedit, "draw_modified_edges",
text="Modified")
- if not show_render:
- layout.itemS()
+ row = col.row()
+ row.itemR(uvedit, "draw_stretch", text="Stretch")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
