[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52204] trunk/blender: remove ifdef' d bevel code, current bevel works better then the previous code.
Campbell Barton
ideasman42 at gmail.com
Wed Nov 14 10:45:19 CET 2012
Revision: 52204
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52204
Author: campbellbarton
Date: 2012-11-14 09:45:15 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
remove ifdef'd bevel code, current bevel works better then the previous code.
reduce strlen check in texttool_suggest_add()
use 'del list[:]' rather then 'list[:] = []' in python scripts which clear lists.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_consistency_check.py
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
trunk/blender/source/blender/blenkernel/intern/suggestions.c
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py 2012-11-14 09:45:15 UTC (rev 52204)
@@ -222,8 +222,8 @@
'''
# reset
- sources_h[:] = []
- sources_c[:] = []
+ del sources_h[:]
+ del sources_c[:]
filen.close()
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2012-11-14 09:45:15 UTC (rev 52204)
@@ -1251,7 +1251,7 @@
bases = list(reversed(struct.get_bases()))
# props
- lines[:] = []
+ del lines[:]
if _BPY_STRUCT_FAKE:
descr_items = [(key, descr) for key, descr in sorted(bpy.types.Struct.__bases__[0].__dict__.items()) if not key.startswith("__")]
@@ -1282,7 +1282,7 @@
fw("\n")
# funcs
- lines[:] = []
+ del lines[:]
if _BPY_STRUCT_FAKE:
for key, descr in descr_items:
@@ -1305,7 +1305,7 @@
fw(line)
fw("\n")
- lines[:] = []
+ del lines[:]
if struct.references:
# use this otherwise it gets in the index for a normal heading.
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2012-11-14 09:45:15 UTC (rev 52204)
@@ -216,7 +216,7 @@
for mod in _global_loaded_modules:
test_reload(mod)
- _global_loaded_modules[:] = []
+ del _global_loaded_modules[:]
for base_path in script_paths():
for path_subdir in _script_module_dirs:
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2012-11-14 09:45:15 UTC (rev 52204)
@@ -223,7 +223,7 @@
else:
other_dir = None
- ed_adj[:] = []
+ del ed_adj[:]
flipped = False
@@ -235,22 +235,22 @@
if other_dir and flipped is False:
flipped = True # only flip the list once
context_loop.reverse()
- ed_adj[:] = []
+ del ed_adj[:]
context_loop.append(other_dir) # save 1 look-up
ed_adj = edges[context_loop[-1]]
if len(ed_adj) != 2:
- ed_adj[:] = []
+ del ed_adj[:]
break
else:
- ed_adj[:] = []
+ del ed_adj[:]
break
i = ed_adj.index(context_loop[-2])
context_loop.append(ed_adj[not i])
# Dont look at this again
- ed_adj[:] = []
+ del ed_adj[:]
return edge_loops
@@ -436,7 +436,7 @@
if s1[0][1] == s1[-1][1]: # remove endpoints double
s1.pop()
- s2[:] = [] # Empty this segment s2 so we don't use it again.
+ del s2[:] # Empty this segment s2 so we don't use it again.
return True
joining_segments = True
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2012-11-14 09:45:15 UTC (rev 52204)
@@ -517,7 +517,7 @@
for uv in f.uv:
uv+= offset
- sourceIsland[0][:] = [] # Empty
+ del sourceIsland[0][:] # Empty
# Move edge loop into new and offset.
@@ -527,7 +527,7 @@
(e[0]+offset, e[1]+offset, e[2])\
) for e in sourceIsland[6] ] )
- sourceIsland[6][:] = [] # Empty
+ del sourceIsland[6][:] # Empty
# Sort by edge length, reverse so biggest are first.
@@ -540,7 +540,7 @@
for p in sourceIsland[7]:
p+= offset
- sourceIsland[7][:] = []
+ del sourceIsland[7][:]
# Decrement the efficiency
Modified: trunk/blender/source/blender/blenkernel/intern/suggestions.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/suggestions.c 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/source/blender/blenkernel/intern/suggestions.c 2012-11-14 09:45:15 UTC (rev 52204)
@@ -47,6 +47,7 @@
static char *documentation = NULL;
//static int doc_lines = 0;
+/* TODO, replace with BLI_strncasecmp() */
static int txttl_cmp(const char *first, const char *second, int len)
{
int cmp, i;
@@ -113,19 +114,18 @@
void texttool_suggest_add(const char *name, char type)
{
+ const int len = strlen(name);
+ int cmp;
SuggItem *newitem, *item;
- int len, cmp;
- newitem = MEM_mallocN(sizeof(SuggItem) + strlen(name) + 1, "SuggestionItem");
+ newitem = MEM_mallocN(sizeof(SuggItem) + len + 1, "SuggItem");
if (!newitem) {
printf("Failed to allocate memory for suggestion.\n");
return;
}
newitem->name = (char *) (newitem + 1);
- len = strlen(name);
- strncpy(newitem->name, name, len);
- newitem->name[len] = '\0';
+ memcpy(newitem->name, name, len + 1);
newitem->type = type;
newitem->prev = newitem->next = NULL;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-11-14 08:12:53 UTC (rev 52203)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-11-14 09:45:15 UTC (rev 52204)
@@ -37,9 +37,6 @@
#include "intern/bmesh_operators_private.h" /* own include */
-#define NEW_BEVEL 1
-
-#ifdef NEW_BEVEL
#define BEVEL_FLAG 1
#define EDGE_SELECTED 2
@@ -1496,858 +1493,4 @@
}
free_bevel_params(&bp);
}
-
}
-
-#else
-#define BEVEL_FLAG 1
-#define BEVEL_DEL 2
-#define FACE_NEW 4
-#define EDGE_OLD 8
-#define FACE_OLD 16
-#define VERT_OLD 32
-#define FACE_SPAN 64
-#define FACE_HOLE 128
-
-typedef struct LoopTag {
- BMVert *newv;
-} LoopTag;
-
-typedef struct EdgeTag {
- BMVert *newv1, *newv2;
-} EdgeTag;
-
-static void calc_corner_co(BMLoop *l, const float fac, float r_co[3],
- const short do_dist, const short do_even)
-{
- float no[3], l_vec_prev[3], l_vec_next[3], l_co_prev[3], l_co[3], l_co_next[3], co_ofs[3];
- int is_concave;
-
- /* first get the prev/next verts */
- if (l->f->len > 2) {
- copy_v3_v3(l_co_prev, l->prev->v->co);
- copy_v3_v3(l_co, l->v->co);
- copy_v3_v3(l_co_next, l->next->v->co);
-
- /* calculate normal */
- sub_v3_v3v3(l_vec_prev, l_co_prev, l_co);
- sub_v3_v3v3(l_vec_next, l_co_next, l_co);
-
- cross_v3_v3v3(no, l_vec_prev, l_vec_next);
- is_concave = dot_v3v3(no, l->f->no) > 0.0f;
- }
- else {
- BMIter iter;
- BMLoop *l2;
- float up[3] = {0.0f, 0.0f, 1.0f};
-
- copy_v3_v3(l_co_prev, l->prev->v->co);
- copy_v3_v3(l_co, l->v->co);
-
- BM_ITER_ELEM (l2, &iter, l->v, BM_LOOPS_OF_VERT) {
- if (l2->f != l->f) {
- copy_v3_v3(l_co_next, BM_edge_other_vert(l2->e, l2->next->v)->co);
- break;
- }
- }
-
- sub_v3_v3v3(l_vec_prev, l_co_prev, l_co);
- sub_v3_v3v3(l_vec_next, l_co_next, l_co);
-
- cross_v3_v3v3(no, l_vec_prev, l_vec_next);
- if (dot_v3v3(no, no) == 0.0f) {
- no[0] = no[1] = 0.0f; no[2] = -1.0f;
- }
-
- is_concave = dot_v3v3(no, up) < 0.0f;
- }
-
-
- /* now calculate the new location */
- if (do_dist) { /* treat 'fac' as distance */
-
- normalize_v3(l_vec_prev);
- normalize_v3(l_vec_next);
-
- add_v3_v3v3(co_ofs, l_vec_prev, l_vec_next);
- if (UNLIKELY(normalize_v3(co_ofs) == 0.0f)) { /* edges form a straight line */
- cross_v3_v3v3(co_ofs, l_vec_prev, l->f->no);
- }
-
- if (do_even) {
- negate_v3(l_vec_next);
- mul_v3_fl(co_ofs, fac * shell_angle_to_dist(0.5f * angle_normalized_v3v3(l_vec_prev, l_vec_next)));
- /* negate_v3(l_vec_next); */ /* no need unless we use again */
- }
- else {
- mul_v3_fl(co_ofs, fac);
- }
- }
- else { /* treat as 'fac' as a factor (0 - 1) */
-
- /* not strictly necessary, balance vectors
- * so the longer edge doesn't skew the result,
- * gives nicer, move even output.
- *
- * Use the minimum rather then the middle value so skinny faces don't flip along the short axis */
- float min_fac = min_ff(normalize_v3(l_vec_prev), normalize_v3(l_vec_next));
- float angle;
-
- if (do_even) {
- negate_v3(l_vec_next);
- angle = angle_normalized_v3v3(l_vec_prev, l_vec_next);
- negate_v3(l_vec_next); /* no need unless we use again */
- }
- else {
- angle = 0.0f;
- }
-
- mul_v3_fl(l_vec_prev, min_fac);
- mul_v3_fl(l_vec_next, min_fac);
-
- add_v3_v3v3(co_ofs, l_vec_prev, l_vec_next);
-
- if (UNLIKELY(is_zero_v3(co_ofs))) {
- cross_v3_v3v3(co_ofs, l_vec_prev, l->f->no);
- normalize_v3(co_ofs);
- mul_v3_fl(co_ofs, min_fac);
- }
-
- /* done */
- if (do_even) {
- mul_v3_fl(co_ofs, (fac * 0.5f) * shell_angle_to_dist(0.5f * angle));
- }
- else {
- mul_v3_fl(co_ofs, fac * 0.5f);
- }
- }
-
- /* apply delta vec */
- if (is_concave)
- negate_v3(co_ofs);
-
- add_v3_v3v3(r_co, co_ofs, l->v->co);
-}
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list