[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21269] branches/blender2.5/blender: 2.5
Brecht Van Lommel
brecht at blender.org
Tue Jun 30 21:20:45 CEST 2009
Revision: 21269
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21269
Author: blendix
Date: 2009-06-30 21:20:45 +0200 (Tue, 30 Jun 2009)
Log Message:
-----------
2.5
Image Window
* Unpack operator now works.
* Some small layout code tweaks.
Info Window Header
* Moved to python UI code.
* template_running_jobs, template_operator_search added.
* Ported external data operators: pack/unpack all, make
paths relative/absolute, find/report missing files.
Also
* Report RPT_INFO too, not only warnings and errors.
* Run UI handle functions after RNA and Operators.
* Rename particle system add/remove operators, to not
include "slot", that's only there for materials because
that's what they are called now in RNA.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_particle.py
branches/blender2.5/blender/release/ui/space_buttons.py
branches/blender2.5/blender/release/ui/space_filebrowser.py
branches/blender2.5/blender/release/ui/space_image.py
branches/blender2.5/blender/source/blender/blenkernel/BKE_packedFile.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_report.h
branches/blender2.5/blender/source/blender/blenkernel/intern/font.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
branches/blender2.5/blender/source/blender/blenkernel/intern/report.c
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
branches/blender2.5/blender/source/blender/editors/space_info/info_intern.h
branches/blender2.5/blender/source/blender/editors/space_info/space_info.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/blender2.5/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Added Paths:
-----------
branches/blender2.5/blender/release/ui/space_info.py
branches/blender2.5/blender/source/blender/editors/space_info/info_ops.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/space_info/info_header.c
Modified: branches/blender2.5/blender/release/ui/buttons_particle.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_particle.py 2009-06-30 19:10:14 UTC (rev 21268)
+++ branches/blender2.5/blender/release/ui/buttons_particle.py 2009-06-30 19:20:45 UTC (rev 21269)
@@ -36,8 +36,8 @@
row.template_list(ob, "particle_systems", "active_particle_system_index")
col = row.column(align=True)
- col.itemO("OBJECT_OT_particle_system_slot_add", icon="ICON_ZOOMIN", text="")
- col.itemO("OBJECT_OT_particle_system_slot_remove", icon="ICON_ZOOMOUT", text="")
+ col.itemO("OBJECT_OT_particle_system_add", icon="ICON_ZOOMIN", text="")
+ col.itemO("OBJECT_OT_particle_system_remove", icon="ICON_ZOOMOUT", text="")
if psys:
split = layout.split(percentage=0.65)
Modified: branches/blender2.5/blender/release/ui/space_buttons.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_buttons.py 2009-06-30 19:10:14 UTC (rev 21268)
+++ branches/blender2.5/blender/release/ui/space_buttons.py 2009-06-30 19:20:45 UTC (rev 21269)
@@ -11,7 +11,7 @@
so = context.space_data
scene = context.scene
- layout.template_header(context)
+ layout.template_header()
if context.area.show_menus:
row = layout.row(align=True)
Modified: branches/blender2.5/blender/release/ui/space_filebrowser.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_filebrowser.py 2009-06-30 19:10:14 UTC (rev 21268)
+++ branches/blender2.5/blender/release/ui/space_filebrowser.py 2009-06-30 19:20:45 UTC (rev 21269)
@@ -11,7 +11,7 @@
layout = self.layout
params = st.params
- layout.template_header(context)
+ layout.template_header()
if context.area.show_menus:
row = layout.row()
@@ -38,11 +38,8 @@
row.itemR(params, "filter_sound", text="");
row.itemR(params, "filter_text", text="");
- if params.do_filter:
- row.active = True
- else:
- row.active = False
-
+ row.active = params.do_filter
+
class FILEBROWSER_MT_directory(bpy.types.Menu):
__space_type__ = "FILE_BROWSER"
__label__ = "Directory"
Modified: branches/blender2.5/blender/release/ui/space_image.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_image.py 2009-06-30 19:10:14 UTC (rev 21268)
+++ branches/blender2.5/blender/release/ui/space_image.py 2009-06-30 19:20:45 UTC (rev 21269)
@@ -96,9 +96,9 @@
else:
layout.itemO("IMAGE_OT_pack")
- # only for dirty && specific image types : XXX poll?
- #if(ibuf && (ibuf->userflags & IB_BITMAPDIRTY))
- if False:
+ # only for dirty && specific image types, perhaps
+ # this could be done in operator poll too
+ if ima.dirty:
if ima.source in ("FILE", "GENERATED") and ima.type != "MULTILAYER":
layout.item_booleanO("IMAGE_OT_pack", "as_png", True, text="Pack As PNG")
@@ -215,8 +215,10 @@
if show_uvedit:
row.itemM("IMAGE_MT_select")
- # XXX menuname= (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))? "Image*": "Image";
- row.itemM("IMAGE_MT_image")
+ if ima and ima.dirty:
+ row.itemM("IMAGE_MT_image", text="Image*")
+ else:
+ row.itemM("IMAGE_MT_image", text="Image")
if show_uvedit:
row.itemM("IMAGE_MT_uvs")
@@ -344,6 +346,10 @@
__region_type__ = "UI"
__label__ = "View Properties"
+ def poll(self, context):
+ sima = context.space_data
+ return (sima and (sima.image or sima.show_uvedit))
+
def draw(self, context):
sima = context.space_data
layout = self.layout
@@ -358,10 +364,12 @@
if ima:
col.itemR(ima, "display_aspect")
- col = split.column()
- col.itemR(sima, "draw_repeated", text="Repeat")
- if show_uvedit:
- col.itemR(uvedit, "normalized_coordinates")
+ col = split.column()
+ col.itemR(sima, "draw_repeated", text="Repeat")
+ if show_uvedit:
+ col.itemR(uvedit, "normalized_coordinates", text="Normalized")
+ elif show_uvedit:
+ col.itemR(uvedit, "normalized_coordinates", text="Normalized")
if show_uvedit:
col = layout.column()
@@ -377,21 +385,6 @@
#col.itemR(uvedit, "draw_edges")
#col.itemR(uvedit, "draw_faces")
-class IMAGE_PT_curves(bpy.types.Panel):
- __space_type__ = "IMAGE_EDITOR"
- __region_type__ = "UI"
- __label__ = "Curves"
-
- def poll(self, context):
- sima = context.space_data
- return (sima and sima.image)
-
- def draw(self, context):
- sima = context.space_data
- layout = self.layout
-
- layout.template_curve_mapping(sima.curves)
-
bpy.types.register(IMAGE_MT_view)
bpy.types.register(IMAGE_MT_select)
bpy.types.register(IMAGE_MT_image)
@@ -403,5 +396,4 @@
bpy.types.register(IMAGE_HT_header)
bpy.types.register(IMAGE_PT_game_properties)
bpy.types.register(IMAGE_PT_view_properties)
-#bpy.types.register(IMAGE_PT_curves)
Added: branches/blender2.5/blender/release/ui/space_info.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_info.py (rev 0)
+++ branches/blender2.5/blender/release/ui/space_info.py 2009-06-30 19:20:45 UTC (rev 21269)
@@ -0,0 +1,119 @@
+
+import bpy
+
+class INFO_HT_header(bpy.types.Header):
+ __space_type__ = "USER_PREFERENCES"
+ __idname__ = "INFO_HT_header"
+
+ def draw(self, context):
+ st = context.space_data
+ layout = self.layout
+
+ layout.template_header()
+
+ if context.area.show_menus:
+ row = layout.row()
+ row.itemM("INFO_MT_file")
+ row.itemM("INFO_MT_add")
+ row.itemM("INFO_MT_timeline")
+ row.itemM("INFO_MT_game")
+ row.itemM("INFO_MT_render")
+ row.itemM("INFO_MT_help")
+
+ layout.template_ID(context.window, "screen") #, new="SCREEN_OT_new", open="SCREEN_OT_unlink")
+ layout.template_ID(context.screen, "scene") #, new="SCENE_OT_new", unlink="SCENE_OT_unlink")
+
+ layout.itemS()
+
+ layout.template_operator_search()
+ layout.template_running_jobs()
+
+class INFO_MT_file(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "File"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator_context = "EXEC_AREA"
+ layout.itemO("WM_OT_read_homefile")
+ layout.operator_context = "INVOKE_AREA"
+ layout.itemO("WM_OT_open_mainfile")
+
+ layout.itemS()
+
+ layout.operator_context = "EXEC_AREA"
+ layout.itemO("WM_OT_save_mainfile")
+ layout.operator_context = "INVOKE_AREA"
+ layout.itemO("WM_OT_save_as_mainfile")
+
+ layout.itemS()
+
+ layout.itemM("INFO_MT_file_external_data")
+
+class INFO_MT_file_external_data(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "External Data"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.itemO("FILE_OT_pack_all", text="Pack into .blend file")
+ layout.itemO("FILE_OT_unpack_all", text="Unpack into Files...")
+
+ layout.itemS()
+
+ layout.itemO("FILE_OT_make_paths_relative")
+ layout.itemO("FILE_OT_make_paths_absolute")
+ layout.itemO("FILE_OT_report_missing_files")
+ layout.itemO("FILE_OT_find_missing_files")
+
+class INFO_MT_add(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "Add"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.itemL(text="Nothing yet")
+
+class INFO_MT_timeline(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "Timeline"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.itemL(text="Nothing yet")
+
+class INFO_MT_game(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "Game"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.itemL(text="Nothing yet")
+
+class INFO_MT_render(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "Render"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.itemL(text="Nothing yet")
+
+class INFO_MT_help(bpy.types.Menu):
+ __space_type__ = "USER_PREFERENCES"
+ __label__ = "Help"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.itemL(text="Nothing yet")
+
+bpy.types.register(INFO_HT_header)
+bpy.types.register(INFO_MT_file)
+bpy.types.register(INFO_MT_file_external_data)
+bpy.types.register(INFO_MT_add)
+bpy.types.register(INFO_MT_timeline)
+bpy.types.register(INFO_MT_game)
+bpy.types.register(INFO_MT_render)
+bpy.types.register(INFO_MT_help)
+
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_packedFile.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_packedFile.h 2009-06-30 19:10:14 UTC (rev 21268)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_packedFile.h 2009-06-30 19:20:45 UTC (rev 21269)
@@ -31,31 +31,43 @@
#ifndef BKE_PACKEDFILE_H
#define BKE_PACKEDFILE_H
-#define RET_OK 0
-#define RET_ERROR 1
+#define RET_OK 0
+#define RET_ERROR 1
-struct PackedFile;
-struct VFont;
struct bSample;
struct bSound;
struct Image;
+struct Main;
+struct PackedFile;
+struct ReportList;
+struct VFont;
-struct PackedFile * newPackedFile(char * filename);
-struct PackedFile * newPackedFileMemory(void *mem, int memlen);
+/* pack */
+struct PackedFile *newPackedFile(struct ReportList *reports, char *filename);
+struct PackedFile *newPackedFileMemory(void *mem, int memlen);
-int seekPackedFile(struct PackedFile * pf, int offset, int whence);
-void rewindPackedFile(struct PackedFile * pf);
-int readPackedFile(struct PackedFile * pf, void * data, int size);
-int countPackedFiles(void);
-void freePackedFile(struct PackedFile * pf);
-void packAll(void);
-int writePackedFile(char * filename, struct PackedFile *pf, int guimode);
-int checkPackedFile(char * filename, struct PackedFile * pf);
-char * unpackFile(char * abs_name, char * local_name, struct PackedFile * pf, int how);
-int unpackVFont(struct VFont * vfont, int how);
-int unpackSample(struct bSample *sample, int how);
-int unpackImage(struct Image * ima, int how);
-void unpackAll(int how);
-
+void packAll(struct Main *bmain, struct ReportList *reports);
+
+/* unpack */
+char *unpackFile(struct ReportList *reports, char *abs_name, char *local_name, struct PackedFile *pf, int how);
+int unpackVFont(struct ReportList *reports, struct VFont *vfont, int how);
+int unpackSample(struct ReportList *reports, struct bSample *sample, int how);
+int unpackImage(struct ReportList *reports, struct Image *ima, int how);
+void unpackAll(struct Main *bmain, struct ReportList *reports, int how);
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list