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

* Bugfix #8426: certain hooks options segfaulted

Browse Source 
This was caused by my previous commit for add_hook.

* Also, removed a compiler warning in the Python code
This commit is contained in:
Joshua Leung
2008-03-03 03:21:25 +00:00
parent 5b54b519c0
commit 7af9e824bf
3 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/src/editobject.c
View File

@@ -634,17 +634,33 @@ int hook_getIndexArray(int *tot, int **indexar, char *name, float *cent_r)
void add_hook_menu(void)
{
ModifierData *md = NULL;
HookModifierData *hmd = NULL;
Object *ob=NULL;
int mode;
if(G.obedit==NULL) return;
if(modifiers_findByType(G.obedit, eModifierType_Hook))
mode= pupmenu("Hooks %t|Add, To New Empty %x1|Add, To Selected Object %x2|Remove... %x3|Reassign... %x4|Select... %x5|Clear Offset...%x6");
else
mode= pupmenu("Hooks %t|Add, New Empty %x1|Add, To Selected Object %x2");
if(mode<1) return;
/* do operations */
add_hook(mode);
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWBUTSOBJECT, 0);
BIF_undo_push("Add hook");
}
void add_hook(int mode)
{
ModifierData *md = NULL;
HookModifierData *hmd = NULL;
Object *ob=NULL;
if(G.obedit==NULL) return;
/* preconditions */
if(mode==2) { /* selected object */
@@ -708,23 +724,6 @@ void add_hook_menu(void)
ob= hmd->object;
}
/* do operations */
add_hook(mode);
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWBUTSOBJECT, 0);
BIF_undo_push("Add hook");
}
void add_hook(int mode)
{
ModifierData *md = NULL;
HookModifierData *hmd = NULL;
Object *ob=NULL;
if(G.obedit==NULL) return;
/* do it, new hooks or reassign */
if(mode==1 || mode==2 || mode==4) {
float cent[3];