Revision: 22494
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22494
Author: nicholasbishop
Date: 2009-08-16 05:24:23 +0200 (Sun, 16 Aug 2009)
Log Message:
-----------
2.5/Posemode:
* Pose mode was already object-localized, but moved the flag from object->flag
to object->mode, with all the other modes.
* Updated object mode RNA
* Commented out some dubious use of base->flag with the posemode flag. So far
as I could see the value was only being set, not read, so a hopefully safe
change.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
branches/blender2.5/blender/source/blender/editors/transform/transform_orientations.c
branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -687,7 +687,7 @@
Object *ob = CTX_data_active_object(C);
if(ob) {
- if(ob->flag & OB_POSEMODE) return "posemode";
+ if(ob->mode & OB_MODE_POSE) return "posemode";
else if(ob->mode & OB_MODE_SCULPT) return
"sculpt_mode";
else if(ob->mode & OB_MODE_WEIGHT_PAINT) return
"weightpaint";
else if(ob->mode & OB_MODE_VERTEX_PAINT) return
"vertexpaint";
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -493,7 +493,7 @@
base->flag |= flag;
/* not too nice... for recovering objects with lost data */
- if(ob->pose==NULL) base->flag &= ~OB_POSEMODE;
+ //if(ob->pose==NULL) base->flag &= ~OB_POSEMODE;
ob->flag= base->flag;
ob->ctime= -1234567.0; /* force ipo to be calculated later */
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -3430,7 +3430,7 @@
if(ob->pose) {
free_pose(ob->pose);
ob->pose= NULL;
- ob->flag &= ~OB_POSEMODE;
+ ob->mode &= ~OB_MODE_POSE;
}
}
for(a=0; a<ob->totcol; a++) ob->mat[a]=
newlibadr_us(fd, ob->id.lib, ob->mat[a]);
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -899,7 +899,7 @@
Object *obact= CTX_data_active_object(C);
/* if in posemode, check if 'pose-channels' requested
for in KeyingSet */
- if ((obact && obact->pose) && (obact->flag &
OB_POSEMODE)) {
+ if ((obact && obact->pose) && (obact->mode &
OB_MODE_POSE)) {
/* check for posechannels */
}
@@ -930,7 +930,7 @@
/* check if the active object is in PoseMode (i.e. only deal with
bones) */
// TODO: check with the templates to see what we really need to store
- if ((obact && obact->pose) && (obact->flag & OB_POSEMODE)) {
+ if ((obact && obact->pose) && (obact->mode & OB_MODE_POSE)) {
/* Pose Mode: Selected bones */
#if 0
//set_pose_keys(ob); /* sets pchan->flag to POSE_KEY if bone
selected, and clears if not */
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -713,7 +713,7 @@
/* get pose of active object and move it out of posemode */
pose= ob->pose;
- ob->flag &= ~OB_POSEMODE;
+ ob->mode &= ~OB_MODE_POSE;
CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
if ((base->object->type==OB_ARMATURE) && (base->object!=ob)) {
@@ -724,8 +724,8 @@
/* Get Pose of current armature */
opose= base->object->pose;
- base->object->flag &= ~OB_POSEMODE;
- BASACT->flag &= ~OB_POSEMODE;
+ base->object->mode &= ~OB_MODE_POSE;
+ //BASACT->flag &= ~OB_MODE_POSE;
/* Find the difference matrix */
Mat4Invert(oimat, ob->obmat);
@@ -1034,8 +1034,8 @@
/* 1) store starting settings and exit editmode */
oldob= obedit;
oldbase= BASACT;
- oldob->flag &= ~OB_POSEMODE;
- oldbase->flag &= ~OB_POSEMODE;
+ oldob->mode &= ~OB_MODE_POSE;
+ //oldbase->flag &= ~OB_POSEMODE;
ED_armature_from_edit(scene, obedit);
ED_armature_edit_free(obedit);
Modified:
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -126,7 +126,7 @@
switch (ob->type){
case OB_ARMATURE:
- ob->flag |= OB_POSEMODE;
+ ob->mode |= OB_MODE_POSE;
base->flag= ob->flag;
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_POSE,
NULL);
@@ -144,7 +144,7 @@
if(base) {
Object *ob= base->object;
- ob->flag &= ~OB_POSEMODE;
+ ob->mode &= ~OB_MODE_POSE;
base->flag= ob->flag;
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
@@ -528,7 +528,7 @@
/* paranoia checks */
if (!ob && !ob->pose) return;
- if (ob==obedit || (ob->flag & OB_POSEMODE)==0) return;
+ if (ob==obedit || (ob->mode & OB_MODE_POSE)==0) return;
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
if (arm->layer & pchan->bone->layer) {
@@ -716,7 +716,7 @@
/* paranoia checks */
if (ELEM(NULL, ob, ob->pose)) return;
- if ((ob==obedit) || (ob->flag & OB_POSEMODE)==0) return;
+ if ((ob==obedit) || (ob->mode & OB_MODE_POSE)==0) return;
/* find active */
for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
@@ -1106,7 +1106,7 @@
// XXX extern VPaint Gwp; /* from vpaint */
Object *poseobj= modifiers_isDeformedByArmature(meshobj);
- if(poseobj==NULL || (poseobj->flag & OB_POSEMODE)==0) {
+ if(poseobj==NULL || (poseobj->mode & OB_MODE_POSE)==0) {
error("The active object must have a deforming armature in pose
mode");
return;
}
@@ -1650,7 +1650,7 @@
if(ob->mode && OB_MODE_WEIGHT_PAINT) {
ob= modifiers_isDeformedByArmature(ob);
}
- if(ob && (ob->flag & OB_POSEMODE)) {
+ if(ob && (ob->mode & OB_MODE_POSE)) {
bPoseChannel *pchan, *pchanf;
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next)
{
@@ -2151,7 +2151,7 @@
/* paranoia checks */
if(!ob && !ob->pose) return;
- if(ob==obedit || (ob->flag & OB_POSEMODE)==0) return;
+ if(ob==obedit || (ob->mode & OB_MODE_POSE)==0) return;
nr= pupmenu("Specials%t|Select Constraint Target%x1|Flip Left-Right
Names%x2|Calculate Paths%x3|Clear Paths%x4|Clear User Transform %x5|Relax Pose
%x6|%l|AutoName Left-Right%x7|AutoName Front-Back%x8|AutoName Top-Bottom%x9");
if(nr==1) {
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-08-16 02:49:37 UTC (rev 22493)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -628,7 +628,7 @@
/* some commonly used macros in the constraints drawing code */
#define is_armature_target(target) (target && target->type==OB_ARMATURE)
-#define is_armature_owner(ob) ((ob->type == OB_ARMATURE) && (ob->flag &
OB_POSEMODE))
+#define is_armature_owner(ob) ((ob->type == OB_ARMATURE) && (ob->mode &
OB_MODE_POSE))
#define is_geom_target(target) (target && (ELEM(target->type, OB_MESH,
OB_LATTICE)) )
/* Helper function for draw constraint - draws constraint space stuff
Modified:
branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -87,7 +87,7 @@
if (ob == NULL)
return NULL;
- if (ob->flag & OB_POSEMODE) {
+ if (ob->mode & OB_MODE_POSE) {
bPoseChannel *pchan;
pchan = get_active_posechannel(ob);
@@ -1065,7 +1065,7 @@
{
/* if this constraint is being added to a posechannel,
make sure
* the constraint gets evaluated in pose-space */
- if (ob->flag & OB_POSEMODE) {
+ if (ob->mode & OB_MODE_POSE) {
con->ownspace = CONSTRAINT_SPACE_POSE;
con->flag |= CONSTRAINT_SPACEONCE;
}
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-08-16 02:49:37 UTC (rev 22493)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-08-16 03:24:23 UTC (rev 22494)
@@ -3886,7 +3886,7 @@
ED_object_exit_editmode(C, EM_FREEDATA);
ED_armature_enter_posemode(C, base);
}
- else if(base->object->flag & OB_POSEMODE)
+ else if(base->object->mode & OB_MODE_POSE)
ED_armature_exit_posemode(C, base);
else
ED_armature_enter_posemode(C, base);
@@ -4109,7 +4109,7 @@
if(obedit==NULL) {
- if(ob->flag & OB_POSEMODE) {
+ if(ob->mode & OB_MODE_POSE) {
// XXX pose_special_editmenu();
}
else if(paint_facesel_test(ob)) {
@@ -4174,7 +4174,7 @@
else if(ob->mode & OB_MODE_WEIGHT_PAINT) {
Object *par= modifiers_isDeformedByArmature(ob);
- if(par && (par->flag & OB_POSEMODE)) {
+ if(par && (par->mode & OB_MODE_POSE)) {
nr= pupmenu("Specials%t|Apply Bone Envelopes to
Vertex Groups %x1|Apply Bone Heat Weights to Vertex Groups %x2");
// XXX if(nr==1 || nr==2)
@@ -6294,7 +6294,7 @@
int a, didit;
ob= base->object;
- if(ob->flag & OB_POSEMODE) {
+ if(ob->mode & OB_MODE_POSE) {
; /* nothing? */
}
else {
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-08-16 02:49:37 UTC (rev 22493)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
