archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 41768.

Browse Source 
Conflicts resolved:
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Additional changes:

* source/blender/makesrna/intern/rna_linestyle.c: Fixed white
space issues that generated a number of compiler errors.  The
problem was that two string literals for enumerating MA_RAMP_SOFT
and MA_RAMP_LINEAR contained a space.  The string literals are
supposed to represent a valid C identifier because of their use
for automatic code generation.

* Stroke transparency has been temporarily disabled due to a
functionality conflict with some merged changes.  A fix of this
issue is planned.
This commit is contained in:
Tamito Kajiyama
2011-11-12 23:12:30 +00:00
parent 1ae159bff4 fc42a6185d
commit 0ca96e1eb1
718 changed files with 95137 additions and 10248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/blender/blenkernel/intern/object.c
View File

@@ -1508,6 +1508,71 @@ void object_mat3_to_rot(Object *ob, float mat[][3], short use_compat)
}
}
void object_tfm_protected_backup(const Object *ob,
ObjectTfmProtectedChannels *obtfm)
{
#define TFMCPY( _v) (obtfm->_v = ob->_v)
#define TFMCPY3D( _v) copy_v3_v3(obtfm->_v, ob->_v)
#define TFMCPY4D( _v) copy_v4_v4(obtfm->_v, ob->_v)
TFMCPY3D(loc);
TFMCPY3D(dloc);
TFMCPY3D(size);
TFMCPY3D(dsize);
TFMCPY3D(rot);
TFMCPY3D(drot);
TFMCPY4D(quat);
TFMCPY4D(dquat);
TFMCPY3D(rotAxis);
TFMCPY3D(drotAxis);
TFMCPY(rotAngle);
TFMCPY(drotAngle);
#undef TFMCPY
#undef TFMCPY3D
#undef TFMCPY4D
}
void object_tfm_protected_restore(Object *ob,
const ObjectTfmProtectedChannels *obtfm,
const short protectflag)
{
unsigned int i;
for (i= 0; i < 3; i++) {
if (protectflag & (OB_LOCK_LOCX<<i)) {
ob->loc[i]= obtfm->loc[i];
ob->dloc[i]= obtfm->dloc[i];
}
if (protectflag & (OB_LOCK_SCALEX<<i)) {
ob->size[i]= obtfm->size[i];
ob->dsize[i]= obtfm->dsize[i];
}
if (protectflag & (OB_LOCK_ROTX<<i)) {
ob->rot[i]= obtfm->rot[i];
ob->drot[i]= obtfm->drot[i];
ob->quat[i + 1]= obtfm->quat[i + 1];
ob->dquat[i + 1]= obtfm->dquat[i + 1];
ob->rotAxis[i]= obtfm->rotAxis[i];
ob->drotAxis[i]= obtfm->drotAxis[i];
}
}
if ((protectflag & OB_LOCK_ROT4D) && (protectflag & OB_LOCK_ROTW)) {
ob->quat[0]= obtfm->quat[0];
ob->dquat[0]= obtfm->dquat[0];
ob->rotAngle= obtfm->rotAngle;
ob->drotAngle= obtfm->drotAngle;
}
}
/* see pchan_apply_mat4() for the equivalent 'pchan' function */
void object_apply_mat4(Object *ob, float mat[][4], const short use_compat, const short use_parent)
{