bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

- Bugfix: 'Hide' button for PoseMode bones (in Editing Buttons) was setting the 'Mult' flag instead

Browse Source 
- Tidied up comments in Action Editor code a bit
This commit is contained in:
Joshua Leung 2008-10-20 04:53:49 +00:00
parent 90721f3f83
commit 67e3ac0edf
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/buttons_editing.c
View File

@ -4635,7 +4635,7 @@ static void editing_panel_pose_bones(Object *ob, bArmature *arm)
uiDefButBitI(block, TOG, BONE_NO_SCALE, B_ARM_RECALCDATA, "S", 70,by-38,20,19, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Don't inherit scale from parent Bone"); uiDefButBitI(block, TOG, BONE_NO_SCALE, B_ARM_RECALCDATA, "S", 70,by-38,20,19, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Don't inherit scale from parent Bone");
uiDefButBitI(block, TOGN, BONE_NO_DEFORM, B_ARM_RECALCDATA, "Deform", 90, by-38, 80, 19, &curBone->flag, 0.0, 0.0, 0.0, 0.0, "Indicate if Bone deforms geometry"); uiDefButBitI(block, TOGN, BONE_NO_DEFORM, B_ARM_RECALCDATA, "Deform", 90, by-38, 80, 19, &curBone->flag, 0.0, 0.0, 0.0, 0.0, "Indicate if Bone deforms geometry");
uiDefButBitI(block, TOG, BONE_MULT_VG_ENV, B_ARM_RECALCDATA, "Mult", 170,by-38,80,19, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Multiply Bone Envelope with VertexGroup"); uiDefButBitI(block, TOG, BONE_MULT_VG_ENV, B_ARM_RECALCDATA, "Mult", 170,by-38,80,19, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Multiply Bone Envelope with VertexGroup");
uiDefButBitI(block, TOG, BONE_MULT_VG_ENV, B_ARM_RECALCDATA, "Hide", 250,by-38,80,19, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Toggles display of this bone in Edit Mode"); uiDefButBitI(block, TOG, BONE_HIDDEN_P, B_ARM_RECALCDATA, "Hide", 250,by-38,80,19, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Toggles display of this bone in Edit Mode");
/* layers */ /* layers */
uiBlockBeginAlign(block); uiBlockBeginAlign(block);

11
source/blender/src/editaction.c
View File

@ -2095,9 +2095,9 @@ void paste_actdata ()
short datatype; short datatype;
Object *ob= OBACT; Object *ob= OBACT;
short no_name= 0; const float offset = (float)(CFRA - actcopy_firstframe);
float offset = CFRA - actcopy_firstframe;
char *actname = NULL, *conname = NULL; char *actname = NULL, *conname = NULL;
short no_name= 0;
/* check if buffer is empty */ /* check if buffer is empty */
if (ELEM(NULL, actcopybuf.first, actcopybuf.last)) { if (ELEM(NULL, actcopybuf.first, actcopybuf.last)) {
@ -2118,13 +2118,13 @@ void paste_actdata ()
/* from selected channels */ /* from selected channels */
for (ale= act_data.first; ale; ale= ale->next) { for (ale= act_data.first; ale; ale= ale->next) {
Ipo *ipo_src=NULL; Ipo *ipo_src = NULL;
bActionChannel *achan; bActionChannel *achan;
IpoCurve *ico, *icu; IpoCurve *ico, *icu;
BezTriple *bezt; BezTriple *bezt;
int i; int i;
/* find matching ipo-block */ /* find suitable IPO-block from buffer to paste from */
for (achan= actcopybuf.first; achan; achan= achan->next) { for (achan= actcopybuf.first; achan; achan= achan->next) {
/* try to match data */ /* try to match data */
if (ale->ownertype == ACTTYPE_ACHAN) { if (ale->ownertype == ACTTYPE_ACHAN) {
@ -2170,7 +2170,8 @@ void paste_actdata ()
/* loop over curves, pasting keyframes */ /* loop over curves, pasting keyframes */
for (ico= ipo_src->curve.first; ico; ico= ico->next) { for (ico= ipo_src->curve.first; ico; ico= ico->next) {
icu= verify_ipocurve((ID*)ob, ico->blocktype, actname, conname, NULL, ico->adrcode, 1); /* get IPO-curve to paste to (IPO-curve might not exist for destination, so gets created) */
icu= verify_ipocurve((ID *)ob, ico->blocktype, actname, conname, NULL, ico->adrcode, 1);
if (icu) { if (icu) {
/* just start pasting, with the the first keyframe on the current frame, and so on */ /* just start pasting, with the the first keyframe on the current frame, and so on */

12
source/blender/src/editaction_gpencil.c
View File

@ -83,7 +83,7 @@
#include "blendef.h" #include "blendef.h"
#include "butspace.h" #include "butspace.h"
#include "PIL_time.h" /* sleep */ #include "PIL_time.h"
#include "mydevice.h" #include "mydevice.h"
/* ***************************************** */ /* ***************************************** */
@ -220,17 +220,22 @@ void set_gplayer_frame_selection (bGPDlayer *gpl, short mode)
select_gpencil_frames (gpl, mode); select_gpencil_frames (gpl, mode);
} }
/* select the frame in this layer that occurs on this frame (there should only be one at most) */
void select_gpencil_frame (bGPDlayer *gpl, int selx, short select_mode) void select_gpencil_frame (bGPDlayer *gpl, int selx, short select_mode)
{ {
bGPDframe *gpf; bGPDframe *gpf;
/* search through frames for a match */ /* search through frames for a match */
for (gpf= gpl->frames.first; gpf; gpf= gpf->next) { for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
if (gpf->framenum == selx) /* there should only be one frame with this frame-number */
if (gpf->framenum == selx) {
gpframe_select(gpf, select_mode); gpframe_select(gpf, select_mode);
break;
}
} }
} }
/* select the frames in this layer that occur within the bounds specified */
void borderselect_gplayer_frames (bGPDlayer *gpl, float min, float max, short select_mode) void borderselect_gplayer_frames (bGPDlayer *gpl, float min, float max, short select_mode)
{ {
bGPDframe *gpf; bGPDframe *gpf;
@ -290,6 +295,7 @@ void deselect_gpencil_layers (void *data, short mode)
/* ***************************************** */ /* ***************************************** */
/* Frame Editing Tools */ /* Frame Editing Tools */
/* Delete selected grease-pencil layers */
void delete_gpencil_layers (void) void delete_gpencil_layers (void)
{ {
ListBase act_data = {NULL, NULL}; ListBase act_data = {NULL, NULL};
@ -396,7 +402,7 @@ void free_gpcopybuf ()
} }
/* This function adds data to the copy/paste buffer, freeing existing data first /* This function adds data to the copy/paste buffer, freeing existing data first
* Only the selected action channels gets their selected keyframes copied. * Only the selected GP-layers get their selected keyframes copied.
*/ */
void copy_gpdata () void copy_gpdata ()
{ {