diff options
| -rwxr-xr-x | release/scripts/object_cookie_cutter.py | 10 | ||||
| -rw-r--r-- | release/scripts/widgetwizard.py | 10 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Object.c | 7 |
3 files changed, 11 insertions, 16 deletions
diff --git a/release/scripts/object_cookie_cutter.py b/release/scripts/object_cookie_cutter.py index a158a6cdfb4..51e4a343442 100755 --- a/release/scripts/object_cookie_cutter.py +++ b/release/scripts/object_cookie_cutter.py @@ -187,13 +187,9 @@ def mesh_edge_dict(me): ed_dict= {} for f in me.faces: if not f.hide: - fidx= [v.index for v in f] - for i in xrange(len(fidx)): - edkey= sorted_indicies(fidx[i], fidx[i-1]) - try: - ed_dict[edkey].append(f) - except: - ed_dict[edkey]= [f] + for edkey in f.edge_keys: + try: ed_dict[edkey].append(f) + except: ed_dict[edkey]= [f] return ed_dict diff --git a/release/scripts/widgetwizard.py b/release/scripts/widgetwizard.py index 9d60fc5061e..8d4ada53910 100644 --- a/release/scripts/widgetwizard.py +++ b/release/scripts/widgetwizard.py @@ -110,7 +110,7 @@ def verifyIpocurve(ky,index): idx = "Basis" else: idx = "Key " + str(index) - crv = ipo[index] + crv = ipo[idx] if crv == None: # print idx crv = ipo.addCurve(idx) @@ -617,11 +617,11 @@ def shapeMenuText(): if key == None: return "" - blocks = key.getBlocks() + blocks = key.blocks menu = "Choose Shape %t|" - for n in xrange(len(blocks)): - menu = menu + blocks[n].name + " %x" + str(n) + "|" - return menu + for i, block in enumerate(blocks): + menu = menu + block.name + " %x" + str(n) + "|" + return menu #draw the widget for the gui diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c index 9d691bcdc62..d7373edbf49 100644 --- a/source/blender/python/api2_2x/Object.c +++ b/source/blender/python/api2_2x/Object.c @@ -2021,11 +2021,10 @@ static PyObject *Object_join( BPy_Object * self, PyObject * args ) temp_base->lay = 1; /*1 layer on */ BLI_addhead( &temp_scene->base, temp_base ); /* finally, link new base to scene */ - /*child->id.us += 1;*/ /*Would usually increase user count but in this case it's ok not to */ - } else { - child->id.us -= 1; /* python object user oddness */ - } + child->id.us += 1; /*Would usually increase user count but in this case it's ok not to */ + //DAG_object_flush_update(temp_scene, temp_base->object, OB_RECALC_DATA); + } } } |