[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60564] branches/vgroup_modifiers: Fix some diffs from trunk missed during merges, for some reasons?\226?\128 ?\166
Bastien Montagne
montagne29 at wanadoo.fr
Sat Oct 5 13:27:02 CEST 2013
Revision: 60564
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60564
Author: mont29
Date: 2013-10-05 11:27:01 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Fix some diffs from trunk missed during merges, for some reasons?\226?\128?\166
Modified Paths:
--------------
branches/vgroup_modifiers/doc/python_api/rst/bmesh.ops.rst
branches/vgroup_modifiers/source/blender/editors/include/ED_buttons.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
Modified: branches/vgroup_modifiers/doc/python_api/rst/bmesh.ops.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/bmesh.ops.rst 2013-10-05 11:03:12 UTC (rev 60563)
+++ branches/vgroup_modifiers/doc/python_api/rst/bmesh.ops.rst 2013-10-05 11:27:01 UTC (rev 60564)
@@ -70,7 +70,7 @@
:type preserve_volume: bool
-.. function:: recalc_face_normals(bm, faces, use_flip)
+.. function:: recalc_face_normals(bm, faces, use_face_tag)
Right-Hand Faces.
@@ -80,8 +80,8 @@
:type bm: :class:`bmesh.types.BMesh`
:arg faces: Undocumented.
:type faces: list of (:class:`bmesh.types.BMFace`)
- :arg use_flip: Reverse the result
- :type use_flip: bool
+ :arg use_face_tag: Tag faces that have been flipped
+ :type use_face_tag: bool
.. function:: region_extend(bm, geom, use_constrict, use_faces)
@@ -147,7 +147,7 @@
:type faces: list of (:class:`bmesh.types.BMFace`)
-.. function:: bisect_edges(bm, edges, cuts)
+.. function:: bisect_edges(bm, edges, cuts, edge_percents)
Edge Bisect.
@@ -160,6 +160,8 @@
:type edges: list of (:class:`bmesh.types.BMEdge`)
:arg cuts: number of cuts
:type cuts: int
+ :arg edge_percents: Undocumented.
+ :type edge_percents: dict mapping vert/edge/face types to float
:return:
- ``geom_split``: newly created vertices and edges
@@ -419,7 +421,7 @@
:rtype: dict with string keys
-.. function:: bridge_loops(bm, edges, use_merge, merge_factor)
+.. function:: bridge_loops(bm, edges, use_pairs, use_cyclic, use_merge, merge_factor)
Bridge edge loops with faces.
@@ -427,6 +429,10 @@
:type bm: :class:`bmesh.types.BMesh`
:arg edges: input edges
:type edges: list of (:class:`bmesh.types.BMEdge`)
+ :arg use_pairs: Undocumented.
+ :type use_pairs: bool
+ :arg use_cyclic: Undocumented.
+ :type use_cyclic: bool
:arg use_merge: Undocumented.
:type use_merge: bool
:arg merge_factor: Undocumented.
@@ -731,7 +737,7 @@
:rtype: dict with string keys
-.. function:: dissolve_verts(bm, verts)
+.. function:: dissolve_verts(bm, verts, use_face_split)
Dissolve Verts.
@@ -739,6 +745,8 @@
:type bm: :class:`bmesh.types.BMesh`
:arg verts: Undocumented.
:type verts: list of (:class:`bmesh.types.BMVert`)
+ :arg use_face_split: Undocumented.
+ :type use_face_split: bool
.. function:: dissolve_edges(bm, edges, use_verts)
@@ -853,7 +861,7 @@
:type iterations: int
-.. function:: subdivide_edges(bm, edges, smooth, fractal, along_normal, cuts, seed, custom_patterns, edge_percents, quad_corner_type, use_grid_fill, use_single_edge, use_only_quads, use_sphere)
+.. function:: subdivide_edges(bm, edges, smooth, smooth_falloff, fractal, along_normal, cuts, seed, custom_patterns, edge_percents, quad_corner_type, use_grid_fill, use_single_edge, use_only_quads, use_sphere)
Subdivide Edges.
@@ -866,6 +874,8 @@
:type edges: list of (:class:`bmesh.types.BMEdge`)
:arg smooth: Undocumented.
:type smooth: float
+ :arg smooth_falloff: SUBD_FALLOFF_ROOT and friends
+ :type smooth_falloff: int
:arg fractal: Undocumented.
:type fractal: float
:arg along_normal: Undocumented.
@@ -1380,7 +1390,7 @@
:rtype: dict with string keys
-.. function:: beautify_fill(bm, faces, edges)
+.. function:: beautify_fill(bm, faces, edges, use_restrict_tag)
Beautify Fill.
@@ -1392,6 +1402,8 @@
:type faces: list of (:class:`bmesh.types.BMFace`)
:arg edges: edges that can be flipped
:type edges: list of (:class:`bmesh.types.BMEdge`)
+ :arg use_restrict_tag: restrict edge rotation to mixed tagged vertices
+ :type use_restrict_tag: bool
:return:
- ``geom``: new flipped faces and edges
@@ -1443,7 +1455,7 @@
:rtype: dict with string keys
-.. function:: inset_individual(bm, faces, thickness, depth, use_even_offset, use_interpolate)
+.. function:: inset_individual(bm, faces, thickness, depth, use_even_offset, use_interpolate, use_relative_offset)
Face Inset (Individual).
@@ -1461,6 +1473,8 @@
:type use_even_offset: bool
:arg use_interpolate: Undocumented.
:type use_interpolate: bool
+ :arg use_relative_offset: Undocumented.
+ :type use_relative_offset: bool
:return:
- ``faces``: output faces
Modified: branches/vgroup_modifiers/source/blender/editors/include/ED_buttons.h
===================================================================
--- branches/vgroup_modifiers/source/blender/editors/include/ED_buttons.h 2013-10-05 11:03:12 UTC (rev 60563)
+++ branches/vgroup_modifiers/source/blender/editors/include/ED_buttons.h 2013-10-05 11:27:01 UTC (rev 60564)
@@ -30,10 +30,10 @@
#include "BLI_utildefines.h"
/* Used to check whether a given texture context is valid in current context. */
-bool ED_texture_context_check_world(struct bContext *C);
-bool ED_texture_context_check_material(struct bContext *C);
-bool ED_texture_context_check_lamp(struct bContext *C);
-bool ED_texture_context_check_particles(struct bContext *C);
-bool ED_texture_context_check_others(struct bContext *C);
+bool ED_texture_context_check_world(const struct bContext *C);
+bool ED_texture_context_check_material(const struct bContext *C);
+bool ED_texture_context_check_lamp(const struct bContext *C);
+bool ED_texture_context_check_particles(const struct bContext *C);
+bool ED_texture_context_check_others(const struct bContext *C);
#endif /* __ED_BUTTONS_H__ */
Modified: branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c 2013-10-05 11:03:12 UTC (rev 60563)
+++ branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c 2013-10-05 11:27:01 UTC (rev 60564)
@@ -1112,20 +1112,10 @@
for (km = U.user_keymaps.first; km; km = km->next) {
if ((km->flag & KEYMAP_MODAL) == 0) {
for (kmdi = km->diff_items.first; kmdi; kmdi = kmdi->next) {
- if (kmdi->add_item) {
- if (kmdi->add_item->ptr) {
- MEM_freeN(kmdi->add_item->ptr);
- kmdi->add_item->ptr = NULL;
- }
+ if (kmdi->add_item)
wm_keymap_item_properties_set(kmdi->add_item);
- }
- if (kmdi->remove_item) {
- if (kmdi->remove_item->ptr) {
- MEM_freeN(kmdi->remove_item->ptr);
- kmdi->remove_item->ptr = NULL;
- }
+ if (kmdi->remove_item)
wm_keymap_item_properties_set(kmdi->remove_item);
- }
}
for (kmi = km->items.first; kmi; kmi = kmi->next)
More information about the Bf-blender-cvs
mailing list