Revision: 15844
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15844
Author: blendix
Date: 2008-07-28 16:35:56 +0200 (Mon, 28 Jul 2008)
Log Message:
-----------
svn merge -r15780:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/apricot/release/scripts/rvk1_torvk2.py
branches/apricot/source/blender/include/BIF_editarmature.h
branches/apricot/source/blender/makesdna/DNA_armature_types.h
branches/apricot/source/blender/makesdna/DNA_constraint_types.h
branches/apricot/source/blender/makesdna/DNA_object_types.h
branches/apricot/source/blender/python/api2_2x/Armature.c
branches/apricot/source/blender/python/api2_2x/Bone.c
branches/apricot/source/blender/python/api2_2x/doc/Armature.py
branches/apricot/source/blender/python/api2_2x/sceneRender.c
branches/apricot/source/blender/src/buttons_editing.c
branches/apricot/source/blender/src/buttons_object.c
branches/apricot/source/blender/src/drawgpencil.c
branches/apricot/source/blender/src/drawview.c
branches/apricot/source/blender/src/editarmature.c
branches/apricot/source/blender/src/editobject.c
branches/apricot/source/blender/src/gpencil.c
branches/apricot/source/blender/src/interface.c
branches/apricot/source/blender/src/outliner.c
branches/apricot/source/blender/src/poseobject.c
branches/apricot/source/blender/src/transform_conversions.c
branches/apricot/source/blender/src/transform_manipulator.c
branches/apricot/source/creator/creator.c
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: branches/apricot/release/scripts/rvk1_torvk2.py
===================================================================
--- branches/apricot/release/scripts/rvk1_torvk2.py 2008-07-28 14:28:19 UTC
(rev 15843)
+++ branches/apricot/release/scripts/rvk1_torvk2.py 2008-07-28 14:35:56 UTC
(rev 15844)
@@ -14,7 +14,7 @@
__version__ = "2007/04/27"
__bpydoc__ = """\
-"DEFORM to RVK2" copies deform data (except
EDGESPLIT,DECIMATE,SUBSURF,BOOLEAN,
+"DEFORM to RVK2" copies deform data (except EDGESPLIT,DECIMATE,SUBSURF,BOOLEAN,
BUILD,MIRROR,ARRAY) of the active object to the RVK (relative vertex key) of
the other selected object.
@@ -25,7 +25,7 @@
The new version of this scrit (Blender 2.43) manages the modifier changes.
There are a lot of modifiers but only the ones which just deforms the shape
can be used : LATTICE, CURVE, WAVE, ARMATURE. You can unset these modifiers
-from the script.
+from the script.
Usage:
@@ -35,7 +35,7 @@
level, the script will ask if it should change that. Before copying data to
the rvk it will also ask whether it should replace or add a new vertex group.
-
+
"""
#----------------------------------------------
@@ -70,7 +70,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
"""
# Copy the rvk (1, or armature, lattice, or
# any mesh deformation except surface
@@ -83,7 +83,7 @@
# download the script :
# http://jmsoler.free.fr/util/blenderfile/py/rvk1_torvk2.py
# Communicate upon problems or errors:
-# http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender
+# http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender
#----------------------------------------------
# Page officielle :
# http://jmsoler.free.fr/util/blenderfile/py/rvk1_torvk2.py
@@ -101,22 +101,22 @@
exec "t=Modifier.Types.%s"%t
return t
-def deform2rvk():
+def deform2rvk():
POSSMOD_list=['EDGESPLIT',
'DECIMATE',
- 'SUBSURF',
- 'BOOLEAN',
+ 'SUBSURF',
+ 'BOOLEAN',
'BUILD',
- 'MIRROR',
+ 'MIRROR',
'ARRAY']
AUTHMOD_list=['LATTICE',
- 'CURVE',
+ 'CURVE',
'WAVE',
'ARMATURE']
MODIFIERS=0
-
+
BMOD=[['Possible Modifiers'],
['Allowed Modifiers']]
@@ -129,8 +129,8 @@
# =============================================================
# must be 2 meshes ============================================
# =============================================================
- if RVK1.getType()=='Mesh' and RVK2.getType()=='Mesh':
- FRAME=Blender.Get('curframe')
+ if RVK1.getType()=='Mesh' and RVK2.getType()=='Mesh':
+ FRAME=Blender.Get('curframe')
DATA2=RVK2.getData()
if DEBUG: print DATA2.getKey()
#
============================================================
@@ -151,7 +151,7 @@
# === Bloc Menu Modifiers ===1 doc
=================
#
===================================================
m=0
- for mod in MODRVK1:
+ for mod in MODRVK1:
if DEBUG: print mod.type
if mod.type in POSSMOD:
BMOD[0].append([Draw.Create(0),mod.type,
@@ -183,7 +183,7 @@
retval = Blender.Draw.PupBlock("MESH 2
RVK", block)
#
===================================================
# === unset Modifiers
=============================
- #
===================================================
+ #
===================================================
for B in BMOD[0][1:]:
if DEBUG: print B[2]
MODRVK1[B[2]][Modifier.Settings.RENDER]=0
@@ -193,12 +193,12 @@
#
===================================================
# === update Modifiers
=============================
#
===================================================
- RVK1.makeDisplayList()
+ #RVK1.makeDisplayList()
#
=======================================================
# === get deformed mesh
================================
#
=======================================================
RVK1NAME=Object.GetSelected()[0].getName()
- meshrvk1=NMesh.GetRawFromObject(RVK1NAME)
+ meshrvk1=NMesh.GetRawFromObject(RVK1NAME)
if DEBUG: print len(meshrvk1.verts)
#
=======================================================
# === get normal mesh for vertex group
=================
@@ -209,18 +209,18 @@
#
=======================================================
DATA2=RVK2.getData()
if DEBUG: print len(meshrvk1.verts)
- if DEBUG: print len(DATA2.verts)
+ if DEBUG: print len(DATA2.verts)
#
========================================================
# ===== is there the same number of vertices
=============
#
========================================================
- if len(meshrvk1.verts)==len(DATA2.verts):
- name = "Do you want to replace or add
vertex groups ? %t| YES %x1| NO ? %x2 "
+ if len(meshrvk1.verts)==len(DATA2.verts):
+ name = "Do you want to replace or add
vertex groups ? %t| YES %x1| NO ? %x2 "
result = Draw.PupMenu(name)
- if result==1:
+ if result==1:
#
=====================================================
# ===== Do we save vertex
groups ? ===================
#
=====================================================
-
GROUPNAME2=DATA2.getVertGroupNames()
+
GROUPNAME2=DATA2.getVertGroupNames()
if len(GROUPNAME2)!=0:
for GROUP2 in
GROUPNAME2:
DATA2.removeVertGroup(GROUP2)
@@ -233,11 +233,11 @@
# ===== now copy the vertices coords
=====================
#
========================================================
for v in meshrvk1.verts:
- i= meshrvk1.verts.index(v)
+ i= meshrvk1.verts.index(v)
v1=DATA2.verts[i]
for n in [0,1,2]:
v1.co[n]=v.co[n]
- DATA2.update()
+ DATA2.update()
DATA2.insertKey(FRAME,'relative')
DATA2.update()
RVK2.makeDisplayList()
@@ -251,23 +251,23 @@
if not B[1]:
MODRVK1[B[2]][Modifier.Settings.RENDER]|=B[-2]
else:
- name = "Meshes Objects must the same
number of vertices %t| Ok. %x1"
+ name = "Meshes Objects must the same
number of vertices %t| Ok. %x1"
result = Draw.PupMenu(name)
return
else:
- name = "Second Object must have at least a
shape key %t| Ok. %x1"
+ name = "Second Object must have at least a
shape key %t| Ok. %x1"
result = Draw.PupMenu(name)
return
- else:
- name = "Object must be Meshes %t| Ok. %x1"
+ else:
+ name = "Object must be Meshes %t| Ok. %x1"
result = Draw.PupMenu(name)
- return
+ return
else :
- name = "At least 2 Meshes as to be selected %t| Ok. %x1"
+ name = "At least 2 Meshes as to be selected %t| Ok. %x1"
result = Draw.PupMenu(name)
return
- Blender.Redraw()
+ Blender.Redraw()
EDITMODE=Blender.Window.EditMode()
Blender.Window.EditMode(0)
deform2rvk()
-Blender.Window.EditMode(EDITMODE)
+Blender.Window.EditMode(EDITMODE)
\ No newline at end of file
Modified: branches/apricot/source/blender/include/BIF_editarmature.h
===================================================================
--- branches/apricot/source/blender/include/BIF_editarmature.h 2008-07-28
14:28:19 UTC (rev 15843)
+++ branches/apricot/source/blender/include/BIF_editarmature.h 2008-07-28
14:35:56 UTC (rev 15844)
@@ -134,6 +134,7 @@
void hide_selected_armature_bones(void);
void hide_unselected_armature_bones(void);
void show_all_armature_bones(void);
+void set_locks_armature_bones(short lock);
#define BONESEL_ROOT 0x10000000
#define BONESEL_TIP 0x20000000
Modified: branches/apricot/source/blender/makesdna/DNA_armature_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_armature_types.h
2008-07-28 14:28:19 UTC (rev 15843)
+++ branches/apricot/source/blender/makesdna/DNA_armature_types.h
2008-07-28 14:35:56 UTC (rev 15844)
@@ -154,7 +154,8 @@
BONE_NO_SCALE = (1<<15), /* No parent
scale */
BONE_HIDDEN_PG = (1<<16), /* hidden bone
when drawing PoseChannels (for ghost drawing) */
BONE_DRAWWIRE = (1<<17), /* bone should
be drawn as OB_WIRE, regardless of draw-types of view+armature */
- BONE_NO_CYCLICOFFSET = (1<<18) /* when no parent, bone
will not get cyclic offset */
+ BONE_NO_CYCLICOFFSET = (1<<18), /* when no parent, bone
will not get cyclic offset */
+ BONE_EDITMODE_LOCKED = (1<<19), /* bone transforms are
locked in EditMode */
} eBone_Flag;
#endif
Modified: branches/apricot/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_constraint_types.h
2008-07-28 14:28:19 UTC (rev 15843)
+++ branches/apricot/source/blender/makesdna/DNA_constraint_types.h
2008-07-28 14:35:56 UTC (rev 15844)
@@ -375,11 +375,13 @@
/* for objects (relative to parent/without parent influence),
* for bones (along normals of bone, without
parent/restpositions)
*/
- CONSTRAINT_SPACE_LOCAL,
+ CONSTRAINT_SPACE_LOCAL, /* = 1 */
/* for posechannels - pose space */
- CONSTRAINT_SPACE_POSE,
- /* for posechannels - local with parent */
- CONSTRAINT_SPACE_PARLOCAL,
+ CONSTRAINT_SPACE_POSE, /* = 2 */
+ /* for posechannels - local with parent */
+ CONSTRAINT_SPACE_PARLOCAL, /* = 3 */
+ /* for files from between 2.43-2.46 (should have been parlocal)
*/
+ CONSTRAINT_SPACE_INVALID, /* = 4. do not exchange for anything! */
} B_CONSTRAINT_SPACETYPES;
/* bConstraintChannel.flag */
Modified: branches/apricot/source/blender/makesdna/DNA_object_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_object_types.h 2008-07-28
14:28:19 UTC (rev 15843)
+++ branches/apricot/source/blender/makesdna/DNA_object_types.h 2008-07-28
14:35:56 UTC (rev 15844)
@@ -469,9 +469,11 @@
#define OB_LOCK_ROTX 8
#define OB_LOCK_ROTY 16
#define OB_LOCK_ROTZ 32
+#define OB_LOCK_ROT 56
#define OB_LOCK_SCALEX 64
#define OB_LOCK_SCALEY 128
#define OB_LOCK_SCALEZ 256
+#define OB_LOCK_SCALE 448
/* ob->softflag in DNA_object_force.h */
Modified: branches/apricot/source/blender/python/api2_2x/Armature.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
