[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28350] branches/render25: RenderBranch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28328 :28349 (Note, skipping changes from properties_texture.py)
Campbell Barton
ideasman42 at gmail.com
Thu Apr 22 18:33:16 CEST 2010
Revision: 28350
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28350
Author: campbellbarton
Date: 2010-04-22 18:33:16 +0200 (Thu, 22 Apr 2010)
Log Message:
-----------
RenderBranch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28328:28349 (Note, skipping changes from properties_texture.py)
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/source/blender/blenfont/BLF_api.h
branches/render25/source/blender/blenfont/intern/Makefile
branches/render25/source/blender/blenfont/intern/blf.c
branches/render25/source/blender/blenkernel/BKE_modifier.h
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/image_gen.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/interface/interface_style.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/interface_widgets.c
branches/render25/source/blender/editors/interface/view2d.c
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/space_buttons/buttons_context.c
branches/render25/source/blender/editors/space_console/console_draw.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_text/text_draw.c
branches/render25/source/blender/makesdna/DNA_ID.h
branches/render25/source/blender/makesrna/intern/rna_ID.c
branches/render25/source/blender/python/generic/blf_api.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/render25/source/blender/blenfont/BLF_types.h
Modified: branches/render25/release/scripts/ui/space_image.py
===================================================================
--- branches/render25/release/scripts/ui/space_image.py 2010-04-22 16:23:44 UTC (rev 28349)
+++ branches/render25/release/scripts/ui/space_image.py 2010-04-22 16:33:16 UTC (rev 28350)
@@ -111,6 +111,7 @@
layout.operator("image.save")
layout.operator("image.save_as")
+ layout.operator("image.save_as", text="Save a Copy").copy = True
if ima.source == 'SEQUENCE':
layout.operator("image.save_sequence")
Modified: branches/render25/release/scripts/ui/space_userpref.py
===================================================================
--- branches/render25/release/scripts/ui/space_userpref.py 2010-04-22 16:23:44 UTC (rev 28349)
+++ branches/render25/release/scripts/ui/space_userpref.py 2010-04-22 16:33:16 UTC (rev 28350)
@@ -1137,7 +1137,7 @@
cats = ['All', 'Disabled', 'Enabled'] + sorted(cats)
- bpy.types.Scene.EnumProperty(items=[(cats[i], cats[i], str(i)) for i in range(len(cats))],
+ bpy.types.Scene.EnumProperty(items=[(cat, cat, str(i)) for i, cat in enumerate(cats)],
name="Category", attr="addon_filter", description="Filter add-ons by category")
bpy.types.Scene.StringProperty(name="Search", attr="addon_search",
description="Search within the selected filter")
@@ -1153,64 +1153,66 @@
for mod, info in addons:
module_name = mod.__name__
+ is_enabled = module_name in used_ext
+
# check if add-on should be visible with current filters
- if filter != "All" and \
- filter != info["category"] and \
- not (module_name not in used_ext and filter == "Disabled"):
+ if (filter == "All") or \
+ (filter == info["category"]) or \
+ (filter == "Enabled" and is_enabled) or \
+ (filter == "Disabled" and not is_enabled):
- continue
- if search and search not in info["name"].lower():
- if info["author"]:
- if search not in info["author"].lower():
+ if search and search not in info["name"].lower():
+ if info["author"]:
+ if search not in info["author"].lower():
+ continue
+ else:
continue
- else:
- continue
- # Addon UI Code
- box = layout.column().box()
- column = box.column()
- row = column.row()
+ # Addon UI Code
+ box = layout.column().box()
+ column = box.column()
+ row = column.row()
- # Arrow #
- # If there are Infos or UI is expanded
- if info["expanded"]:
- row.operator("wm.addon_expand", icon="TRIA_DOWN").module = module_name
- elif info["author"] or info["version"] or info["url"] or info["location"]:
- row.operator("wm.addon_expand", icon="TRIA_RIGHT").module = module_name
- else:
- # Else, block UI
- arrow = row.column()
- arrow.enabled = False
- arrow.operator("wm.addon_expand", icon="TRIA_RIGHT").module = module_name
+ # Arrow #
+ # If there are Infos or UI is expanded
+ if info["expanded"]:
+ row.operator("wm.addon_expand", icon="TRIA_DOWN").module = module_name
+ elif info["author"] or info["version"] or info["url"] or info["location"]:
+ row.operator("wm.addon_expand", icon="TRIA_RIGHT").module = module_name
+ else:
+ # Else, block UI
+ arrow = row.column()
+ arrow.enabled = False
+ arrow.operator("wm.addon_expand", icon="TRIA_RIGHT").module = module_name
- row.label(text=info["name"])
- row.operator("wm.addon_disable" if module_name in used_ext else "wm.addon_enable").module = module_name
+ row.label(text=info["name"])
+ row.operator("wm.addon_disable" if is_enabled else "wm.addon_enable").module = module_name
- # Expanded UI (only if additional infos are available)
- if info["expanded"]:
- if info["author"]:
- split = column.row().split(percentage=0.15)
- split.label(text='Author:')
- split.label(text=info["author"])
- if info["version"]:
- split = column.row().split(percentage=0.15)
- split.label(text='Version:')
- split.label(text=info["version"])
- if info["location"]:
- split = column.row().split(percentage=0.15)
- split.label(text='Location:')
- split.label(text=info["location"])
- if info["description"]:
- split = column.row().split(percentage=0.15)
- split.label(text='Description:')
- split.label(text=info["description"])
- if info["url"]:
- split = column.row().split(percentage=0.15)
- split.label(text="Internet:")
- split.operator("wm.addon_links", text="Link to the Wiki").link = info["url"]
- split.separator()
- split.separator()
+ # Expanded UI (only if additional infos are available)
+ if info["expanded"]:
+ if info["author"]:
+ split = column.row().split(percentage=0.15)
+ split.label(text='Author:')
+ split.label(text=info["author"])
+ if info["version"]:
+ split = column.row().split(percentage=0.15)
+ split.label(text='Version:')
+ split.label(text=info["version"])
+ if info["location"]:
+ split = column.row().split(percentage=0.15)
+ split.label(text='Location:')
+ split.label(text=info["location"])
+ if info["description"]:
+ split = column.row().split(percentage=0.15)
+ split.label(text='Description:')
+ split.label(text=info["description"])
+ if info["url"]:
+ split = column.row().split(percentage=0.15)
+ split.label(text="Internet:")
+ split.operator("wm.addon_links", text="Link to the Wiki").link = info["url"]
+ split.separator()
+ split.separator()
# Append missing scripts
# First collect scripts that are used but have no script file.
Modified: branches/render25/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/render25/source/blender/blenfont/BLF_api.h 2010-04-22 16:23:44 UTC (rev 28349)
+++ branches/render25/source/blender/blenfont/BLF_api.h 2010-04-22 16:33:16 UTC (rev 28350)
@@ -37,50 +37,47 @@
int BLF_load(char *name);
int BLF_load_mem(char *name, unsigned char *mem, int mem_size);
+int BLF_load_unique(char *name);
+int BLF_load_mem_unique(char *name, unsigned char *mem, int mem_size);
+
/* Attach a file with metrics information from memory. */
-void BLF_metrics_attach(unsigned char *mem, int mem_size);
+void BLF_metrics_attach(int fontid, unsigned char *mem, int mem_size);
-/*
- * Set/Get the current font.
- */
-void BLF_set(int fontid);
-int BLF_get(void);
+void BLF_aspect(int fontid, float aspect);
+void BLF_position(int fontid, float x, float y, float z);
+void BLF_size(int fontid, int size, int dpi);
-void BLF_aspect(float aspect);
-void BLF_position(float x, float y, float z);
-void BLF_size(int size, int dpi);
-
/* Draw the string using the default font, size and dpi. */
void BLF_draw_default(float x, float y, float z, char *str);
/* Draw the string using the current font. */
-void BLF_draw(char *str);
+void BLF_draw(int fontid, char *str);
/*
* This function return the bounding box of the string
* and are not multiplied by the aspect.
*/
-void BLF_boundbox(char *str, struct rctf *box);
+void BLF_boundbox(int fontid, char *str, struct rctf *box);
/*
* The next both function return the width and height
* of the string, using the current font and both value
* are multiplied by the aspect of the font.
*/
-float BLF_width(char *str);
-float BLF_height(char *str);
+float BLF_width(int fontid, char *str);
+float BLF_height(int fontid, char *str);
/*
* The following function return the width and height of the string, but
* just in one call, so avoid extra freetype2 stuff.
*/
-void BLF_width_and_height(char *str, float *width, float *height);
+void BLF_width_and_height(int fontid, char *str, float *width, float *height);
/*
* For fixed width fonts only, returns the width of a
* character.
*/
-float BLF_fixed_width(void);
+float BLF_fixed_width(int fontid);
/*
* and this two function return the width and height
@@ -91,27 +88,33 @@
float BLF_height_default(char *str);
/*
- * set rotation for default font
+ * Set rotation for default font.
*/
-void BLF_default_rotation(float angle);
+void BLF_rotation_default(float angle);
/*
+ * Enable/disable options to the default font.
+ */
+void BLF_enable_default(int option);
+void BLF_disable_default(int option);
+
+/*
* By default, rotation and clipping are disable and
* have to be enable/disable using BLF_enable/disable.
*/
-void BLF_rotation(float angle);
-void BLF_clipping(float xmin, float ymin, float xmax, float ymax);
-void BLF_blur(int size);
+void BLF_rotation(int fontid, float angle);
+void BLF_clipping(int fontid, float xmin, float ymin, float xmax, float ymax);
+void BLF_blur(int fontid, int size);
-void BLF_enable(int option);
-void BLF_disable(int option);
+void BLF_enable(int fontid, int option);
+void BLF_disable(int fontid, int option);
/*
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list