[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56438] branches/vgroup_modifiers: svn merge -r 56418:56437 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Wed May 1 12:51:13 CEST 2013
Revision: 56438
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56438
Author: mont29
Date: 2013-05-01 10:51:12 +0000 (Wed, 01 May 2013)
Log Message:
-----------
svn merge -r 56418:56437 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/release/scripts/modules/console/complete_namespace.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render_layer.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/vgroup_modifiers/source/blender/blenkernel/BKE_text.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_select.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_cursor.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/vgroup_modifiers/source/blender/editors/space_console/console_ops.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c
branches/vgroup_modifiers/source/blender/editors/transform/transform.c
branches/vgroup_modifiers/source/blender/editors/transform/transform.h
branches/vgroup_modifiers/source/blender/editors/transform/transform_constraints.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/vgroup_modifiers/source/blender/freestyle/FRS_freestyle.h
branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/vgroup_modifiers/source/blender/imbuf/intern/rectop.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types_customdata.c
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56418
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56437
Modified: branches/vgroup_modifiers/release/scripts/modules/console/complete_namespace.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/modules/console/complete_namespace.py 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/release/scripts/modules/console/complete_namespace.py 2013-05-01 10:51:12 UTC (rev 56438)
@@ -96,12 +96,22 @@
if not hasattr(obj, '__getitem__'):
# obj is not a list or dictionary
return []
- if is_dict(obj):
+
+ obj_is_dict = is_dict(obj)
+
+ # rare objects have a __getitem__ but no __len__ (eg. BMEdge)
+ if not obj_is_dict:
+ try:
+ obj_len = len(obj)
+ except TypeError:
+ return []
+
+ if obj_is_dict:
# dictionary type
matches = ['%s[%r]' % (base, key) for key in sorted(obj.keys())]
else:
- # list type
- matches = ['%s[%d]' % (base, idx) for idx in range(len(obj))]
+ # list type,
+ matches = ['%s[%d]' % (base, idx) for idx in range(obj_len)]
if word != base:
matches = [match for match in matches if match.startswith(word)]
return matches
Modified: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render_layer.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render_layer.py 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render_layer.py 2013-05-01 10:51:12 UTC (rev 56438)
@@ -122,7 +122,7 @@
class RENDERLAYER_PT_layer_passes(RenderLayerButtonsPanel, Panel):
- bl_label = "Render Passes"
+ bl_label = "Passes"
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER'}
Modified: branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py 2013-05-01 10:51:12 UTC (rev 56438)
@@ -582,26 +582,36 @@
layout.separator()
+ # primitive
layout.operator("mesh.select_all").action = 'TOGGLE'
layout.operator("mesh.select_all", text="Inverse").action = 'INVERT'
layout.separator()
- layout.operator("mesh.select_ungrouped", text="Ungrouped Verts")
+ # numeric
layout.operator("mesh.select_random", text="Random")
layout.operator("mesh.select_nth")
+
+ layout.separator()
+
+ # geometric
layout.operator("mesh.edges_select_sharp", text="Sharp Edges")
layout.operator("mesh.faces_select_linked_flat", text="Linked Flat Faces")
- layout.operator("mesh.select_interior_faces", text="Interior Faces")
- layout.operator("mesh.select_axis", text="Side of Active")
layout.separator()
- layout.operator("mesh.select_face_by_sides")
+ # topology
+ layout.operator("mesh.select_loose", text="Loose Geometry")
if context.scene.tool_settings.mesh_select_mode[2] is False:
layout.operator("mesh.select_non_manifold", text="Non Manifold")
- layout.operator("mesh.select_loose", text="Loose Geometry")
+ layout.operator("mesh.select_interior_faces", text="Interior Faces")
+ layout.operator("mesh.select_face_by_sides")
+
+ layout.separator()
+
+ # other ...
layout.operator_menu_enum("mesh.select_similar", "type", text="Similar")
+ layout.operator("mesh.select_ungrouped", text="Ungrouped Verts")
layout.separator()
@@ -611,6 +621,7 @@
layout.separator()
layout.operator("mesh.select_mirror", text="Mirror")
+ layout.operator("mesh.select_axis", text="Side of Active")
layout.operator("mesh.select_linked", text="Linked")
layout.operator("mesh.select_vertex_path", text="Vertex Path")
Modified: branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-05-01 10:51:12 UTC (rev 56438)
@@ -687,9 +687,11 @@
elif context.image_paint_object and brush:
col = layout.column()
- col.template_color_picker(brush, "color", value_slider=True)
- col.prop(brush, "color", text="")
+ if brush.image_tool == 'DRAW' and brush.blend not in ('ERASE_ALPHA', 'ADD_ALPHA'):
+ col.template_color_picker(brush, "color", value_slider=True)
+ col.prop(brush, "color", text="")
+
row = col.row(align=True)
self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")
self.prop_unified_size(row, context, brush, "use_pressure_size")
@@ -825,7 +827,7 @@
@classmethod
def poll(cls, context):
brush = context.tool_settings.image_paint.brush
- return (context.image_paint_object and brush and brush.image_tool != 'SOFTEN')
+ return (context.image_paint_object and brush)
def draw(self, context):
layout = self.layout
Modified: branches/vgroup_modifiers/source/blender/blenkernel/BKE_text.h
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/BKE_text.h 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/source/blender/blenkernel/BKE_text.h 2013-05-01 10:51:12 UTC (rev 56438)
@@ -101,6 +101,8 @@
void txt_move_lines (struct Text *text, const int direction);
void txt_duplicate_line (struct Text *text);
int txt_setcurr_tab_spaces(struct Text *text, int space);
+bool txt_cursor_is_line_start(struct Text *text);
+bool txt_cursor_is_line_end(struct Text *text);
/* utility functions, could be moved somewhere more generic but are python/text related */
int text_check_bracket(const char ch);
Modified: branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c 2013-05-01 10:51:12 UTC (rev 56438)
@@ -760,8 +760,8 @@
static void brush_imbuf_tex_co(rctf *mapping, int x, int y, float texco[3])
{
- texco[0] = mapping->xmin + x*mapping->xmax;
- texco[1] = mapping->ymin + y*mapping->ymax;
+ texco[0] = mapping->xmin + x * mapping->xmax;
+ texco[1] = mapping->ymin + y * mapping->ymax;
texco[2] = 0.0f;
}
Modified: branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c 2013-05-01 10:51:12 UTC (rev 56438)
@@ -780,6 +780,16 @@
*linep = &text->sell; *charp = &text->selc;
}
+bool txt_cursor_is_line_start(Text *text)
+{
+ return (text->selc == 0);
+}
+
+bool txt_cursor_is_line_end(Text *text)
+{
+ return (text->selc == text->sell->len);
+}
+
/*****************************/
/* Cursor movement functions */
/*****************************/
Modified: branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c 2013-05-01 10:42:43 UTC (rev 56437)
+++ branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c 2013-05-01 10:51:12 UTC (rev 56438)
@@ -233,6 +233,7 @@
/* slots_in */
{{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
{"cuts", BMO_OP_SLOT_INT}, /* number of cuts */
+ {"edge_percents", BMO_OP_SLOT_MAPPING, {BMO_OP_SLOT_SUBTYPE_MAP_FLT}},
{{'\0'}},
},
/* slots_out */
Property changes on: branches/vgroup_modifiers/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list