[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58032] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Jul 6 07:22:17 CEST 2013
Revision: 58032
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58032
Author: gdh
Date: 2013-07-06 05:22:17 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58026 to r58031.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58026
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58031
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_edgeloop.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58025
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58031
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py 2013-07-06 03:04:48 UTC (rev 58031)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py 2013-07-06 05:22:17 UTC (rev 58032)
@@ -471,34 +471,29 @@
return operator_path_undo_return(context, data_path)
-class WM_MT_context_menu_enum(Menu):
- bl_label = ""
- data_path = "" # BAD DESIGN, set from operator below.
+class WM_OT_context_menu_enum(Operator):
+ bl_idname = "wm.context_menu_enum"
+ bl_label = "Context Enum Menu"
+ bl_options = {'UNDO', 'INTERNAL'}
+ data_path = rna_path_prop
- def draw(self, context):
+ def execute(self, context):
data_path = self.data_path
value = context_path_validate(context, data_path)
+
if value is Ellipsis:
return {'PASS_THROUGH'}
+
base_path, prop_string = data_path.rsplit(".", 1)
value_base = context_path_validate(context, base_path)
prop = value_base.bl_rna.properties[prop_string]
- layout = self.layout
- layout.label(prop.name, icon=prop.icon)
- layout.prop(value_base, prop_string, expand=True)
+ def draw_cb(self, context):
+ layout = self.layout
+ layout.prop(value_base, prop_string, expand=True)
+ context.window_manager.popup_menu(draw_func=draw_cb, title=prop.name, icon=prop.icon)
-class WM_OT_context_menu_enum(Operator):
- bl_idname = "wm.context_menu_enum"
- bl_label = "Context Enum Menu"
- bl_options = {'UNDO', 'INTERNAL'}
- data_path = rna_path_prop
-
- def execute(self, context):
- data_path = self.data_path
- WM_MT_context_menu_enum.data_path = data_path
- bpy.ops.wm.call_menu(name="WM_MT_context_menu_enum")
return {'PASS_THROUGH'}
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c 2013-07-06 03:04:48 UTC (rev 58031)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c 2013-07-06 05:22:17 UTC (rev 58032)
@@ -1698,7 +1698,7 @@
if (pmd->canvas && !(pmd->canvas->flags & MOD_DPAINT_BAKING)) {
DynamicPaintSurface *surface;
- int update_normals = 0;
+ bool update_normals = false;
/* loop through surfaces */
for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
@@ -1881,19 +1881,21 @@
normal_short_to_float_v3(normal, mvert[i].no);
madd_v3_v3fl(mvert[i].co, normal, wPoint[i].height);
}
- update_normals = 1;
+ update_normals = true;
}
/* displace */
if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) {
dynamicPaint_applySurfaceDisplace(surface, result);
- update_normals = 1;
+ update_normals = true;
}
}
}
}
- result->dirty |= DM_DIRTY_NORMALS;
+ if (update_normals) {
+ result->dirty |= DM_DIRTY_NORMALS;
+ }
}
/* make a copy of dm to use as brush data */
if (pmd->brush) {
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_edgeloop.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_edgeloop.c 2013-07-06 03:04:48 UTC (rev 58031)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_edgeloop.c 2013-07-06 05:22:17 UTC (rev 58032)
@@ -62,22 +62,19 @@
BMO_elem_flag_enable(bm, e, EDGE_MARK);
BM_ITER_ELEM (v, &viter, e, BM_VERTS_OF_EDGE) {
if (BMO_elem_flag_test(bm, v, VERT_USED) == false) {
- BMO_elem_flag_enable(bm, v, VERT_USED);
- verts[i++] = v;
if (i == tote) {
- break;
+ goto cleanup;
}
+
+ BMO_elem_flag_enable(bm, v, VERT_USED);
+ verts[i++] = v;
}
}
- if (i > tote) {
- break;
- }
}
/* we have a different number of verts to edges */
if (i != tote) {
- MEM_freeN(verts);
- return;
+ goto cleanup;
}
/* loop over connected flagged edges and fill in faces, this is made slightly more
@@ -156,5 +153,6 @@
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "faces.out", BM_FACE, ELE_OUT);
}
+cleanup:
MEM_freeN(verts);
}
More information about the Bf-blender-cvs
mailing list