Revision: 17863
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17863
Author: aligorith
Date: 2008-12-15 02:04:44 +0100 (Mon, 15 Dec 2008)
Log Message:
-----------
AnimSys2: Resolving conflicts from merge
Thanks Martin!
Modified Paths:
--------------
branches/animsys2/SConstruct
branches/animsys2/source/blender/blenkernel/BKE_blender.h
branches/animsys2/source/blender/blenloader/intern/readfile.c
branches/animsys2/source/blender/include/transform.h
branches/animsys2/source/blender/makesdna/DNA_armature_types.h
branches/animsys2/source/blender/src/editarmature.c
Modified: branches/animsys2/SConstruct
===================================================================
--- branches/animsys2/SConstruct 2008-12-15 00:25:38 UTC (rev 17862)
+++ branches/animsys2/SConstruct 2008-12-15 01:04:44 UTC (rev 17863)
@@ -115,8 +115,8 @@
env.Tool('mstoolkit', ['tools'])
else:
env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
- if env:
- btools.SetupSpawn(env)
+ #if env:
+ # btools.SetupSpawn(env)
else:
env = BlenderEnvironment(ENV = os.environ)
Modified: branches/animsys2/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/animsys2/source/blender/blenkernel/BKE_blender.h 2008-12-15
00:25:38 UTC (rev 17862)
+++ branches/animsys2/source/blender/blenkernel/BKE_blender.h 2008-12-15
01:04:44 UTC (rev 17863)
@@ -41,11 +41,7 @@
struct MemFile;
#define BLENDER_VERSION 248
-<<<<<<< .working
#define BLENDER_SUBVERSION 3
-=======
-#define BLENDER_SUBVERSION 2
->>>>>>> .merge-right.r17860
#define BLENDER_MINVERSION 245
#define BLENDER_MINSUBVERSION 15
Modified: branches/animsys2/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/animsys2/source/blender/blenloader/intern/readfile.c
2008-12-15 00:25:38 UTC (rev 17862)
+++ branches/animsys2/source/blender/blenloader/intern/readfile.c
2008-12-15 01:04:44 UTC (rev 17863)
@@ -8009,15 +8009,22 @@
}
}
-<<<<<<< .working
if (main->versionfile < 248 || (main->versionfile == 248 &&
main->subversionfile < 2)) {
+ Scene *sce;
Ipo *ipo;
IpoCurve *icu;
+ /* fix IPO-curves to work with new interpolation options */
for (ipo=main->ipo.first; ipo; ipo= ipo->id.next) {
for (icu= ipo->curve.first; icu; icu= icu->next)
set_interpolation_ipocurve(icu, icu->ipo);
}
+
+ /* Note, these will need to be added for painting */
+ for (sce= main->scene.first; sce; sce= sce->id.next) {
+ sce->toolsettings->imapaint.seam_bleed = 2;
+ sce->toolsettings->imapaint.normal_angle = 80;
+ }
}
if (main->versionfile < 248 || (main->versionfile == 248 &&
main->subversionfile < 3)) {
bScreen *sc;
@@ -8060,19 +8067,6 @@
}
}
-=======
- if (main->versionfile < 248 || (main->versionfile == 248 &&
main->subversionfile < 2)) {
- Scene *sce;
-
- /* Note, these will need to be added for painting */
- for (sce= main->scene.first; sce; sce= sce->id.next) {
- sce->toolsettings->imapaint.seam_bleed = 2;
- sce->toolsettings->imapaint.normal_angle = 80;
- }
- }
-
-
->>>>>>> .merge-right.r17860
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
Modified: branches/animsys2/source/blender/include/transform.h
===================================================================
--- branches/animsys2/source/blender/include/transform.h 2008-12-15
00:25:38 UTC (rev 17862)
+++ branches/animsys2/source/blender/include/transform.h 2008-12-15
01:04:44 UTC (rev 17863)
@@ -297,11 +297,8 @@
#define TD_NO_EXT (1 << 10) /* ext abused for
particle key timing */
#define TD_SKIP (1 << 11) /* don't
transform this data */
#define TD_BEZTRIPLE (1 << 12) /* if this is a bez triple, we
need to restore the handles, if this is set transdata->misc.hdata needs freeing
*/
-<<<<<<< .working
#define TD_NOTIMESNAP (1 << 13) /* for IPO-autosnap, indicates
that point should not undergo autosnapping */
-=======
-#define TD_NO_LOC (1 << 13) /* when this is set,
don't apply translation changes to this element */
->>>>>>> .merge-right.r17860
+#define TD_NO_LOC (1 << 14) /* when this is set,
don't apply translation changes to this element */
/* transsnap->status */
#define SNAP_ON 1
Modified: branches/animsys2/source/blender/makesdna/DNA_armature_types.h
===================================================================
--- branches/animsys2/source/blender/makesdna/DNA_armature_types.h
2008-12-15 00:25:38 UTC (rev 17862)
+++ branches/animsys2/source/blender/makesdna/DNA_armature_types.h
2008-12-15 01:04:44 UTC (rev 17863)
@@ -156,11 +156,8 @@
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_EDITMODE_LOCKED = (1<<19), /* bone transforms are
locked in EditMode */
-<<<<<<< .working
- BONE_UNSELECTABLE = (1<<20), /* bone cannot
be selected */
-=======
BONE_TRANSFORM_CHILD = (1<<20), /* Indicates that a
parent is also being transformed */
->>>>>>> .merge-right.r17860
+ BONE_UNSELECTABLE = (1<<21), /* bone cannot
be selected */
} eBone_Flag;
#endif
Modified: branches/animsys2/source/blender/src/editarmature.c
===================================================================
--- branches/animsys2/source/blender/src/editarmature.c 2008-12-15 00:25:38 UTC
(rev 17862)
+++ branches/animsys2/source/blender/src/editarmature.c 2008-12-15 01:04:44 UTC
(rev 17863)
@@ -1835,8 +1835,32 @@
}
}
-<<<<<<< .working
+/* adjust bone roll to align Z axis with vector
+ * vec is in local space and is normalized
+ */
+float rollBoneToVector(EditBone *bone, float new_up_axis[3])
+{
+ float mat[3][3], nor[3], up_axis[3], vec[3];
+ float roll;
+ VecSubf(nor, bone->tail, bone->head);
+
+ vec_roll_to_mat3(nor, 0, mat);
+ VECCOPY(up_axis, mat[2]);
+
+ roll = NormalizedVecAngle2(new_up_axis, up_axis);
+
+ Crossf(vec, up_axis, new_up_axis);
+
+ if (Inpf(vec, nor) < 0)
+ {
+ roll = -roll;
+ }
+
+ return roll;
+}
+
+
/* Set roll value for given bone -> Z-Axis Point up (original method) */
void auto_align_ebone_zaxisup(EditBone *ebone)
{
@@ -1904,33 +1928,6 @@
}
}
-=======
-/* adjust bone roll to align Z axis with vector
- * vec is in local space and is normalized
- */
-float rollBoneToVector(EditBone *bone, float new_up_axis[3])
-{
- float mat[3][3], nor[3], up_axis[3], vec[3];
- float roll;
-
- VecSubf(nor, bone->tail, bone->head);
-
- vec_roll_to_mat3(nor, 0, mat);
- VECCOPY(up_axis, mat[2]);
-
- roll = NormalizedVecAngle2(new_up_axis, up_axis);
-
- Crossf(vec, up_axis, new_up_axis);
-
- if (Inpf(vec, nor) < 0)
- {
- roll = -roll;
- }
-
- return roll;
-}
-
->>>>>>> .merge-right.r17860
/* Sets the roll value of selected bones, depending on the mode
* mode == 0: their z-axes point upwards
* mode == 1: their z-axes point towards 3d-cursor
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
