kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

A couple of small fixes...

Browse Source 
I removed config.h code from the files that had them.
effect.c had nested /* so cleaned that up...

added a newline to vector.c to shut gcc up ;)
buttons_editing.c had a possible unintalized var (height) so I gave
it a default value.

removed an unused var i in interface_draw.c
removed an unused var mti in outliner.c

in BL_SkinDeformer.cpp
commented out a call to bDeformGroup->data which no longer exists so it
compiles again.

Kent
This commit is contained in:
Kent Mein 2005-08-11 16:39:51 +00:00
parent 2cb9c4db0c
commit 841ddb4680
6 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/effect.c
View File

@ -76,10 +76,6 @@
#include "render.h" // externtex, bad level call (ton)
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Effect *add_effect(int type)
{
Effect *eff=0;
@ -1438,7 +1434,7 @@ int SoftBodyDetectCollision(float opco[3], float npco[3], float colco[3],
DispListMesh *disp_mesh = 0;
MFace *mface;
Object *copyob;
/* do object level stuff
/* do object level stuff */
/* need to have user control for that since it depends on model scale */
innerfacethickness =-ob->pd->pdef_sbift;
outerfacethickness =ob->pd->pdef_sboft;

1
source/blender/python/api2_2x/vector.c
View File

@ -689,3 +689,4 @@ PyObject *Vector_Negate(VectorObject * self)
}
//#######################################################################
//#############################DEPRECATED################################

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

@ -35,10 +35,6 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef WIN32
#ifndef snprintf
#define snprintf _snprintf
@ -808,7 +804,8 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
int isVirtual = md->mode&eModifierMode_Virtual;
int x = *xco, y = *yco, color = md->error?TH_REDALERT:TH_BUT_NEUTRAL;
short height, width = 295;
short height = 86;
short width = 295;
char str[128];
uiBut *but;

8
source/blender/src/interface_draw.c
View File

@ -41,10 +41,6 @@
#include <string.h>
#include <ctype.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef WIN32
#include <unistd.h>
#else
@ -154,10 +150,6 @@ static void ui_draw_icon(uiBut *but, BIFIconID icon)
int blend= 0;
float xs=0, ys=0;
if (icon==VICON_X) {
int i = 0;
}
// this icon doesn't need draw...
if(icon==ICON_BLANK1) return;

5
source/blender/src/outliner.c
View File

@ -104,10 +104,6 @@
#include "blendef.h"
#include "mydevice.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#define OL_H 19
#define OL_X 18
@ -509,7 +505,6 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
int index;
for (index=0,md=ob->modifiers.first; md; index++,md=md->next) {
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
TreeElement *te = outliner_add_element(soops, &temod->subtree, ob, temod, TSE_MODIFIER, index);
if(te) te->name= md->name;

7
source/gameengine/Converter/BL_SkinDeformer.cpp
View File

@ -182,8 +182,11 @@ void BL_SkinDeformer::SetArmature(BL_ArmatureObject *armobj)
{
m_armobj = armobj;
for (bDeformGroup *dg=(bDeformGroup*)m_defbase->first; dg; dg=(bDeformGroup*)dg->next)
dg->data = (void*)get_named_bone(m_armobj->GetArmature(), dg->name);
for (bDeformGroup *dg=(bDeformGroup*)m_defbase->first; dg; dg=(bDeformGroup*)dg->next) {
/* dg->data no longer exists needs update
dg->data = (void*)get_named_bone(m_armobj->GetArmature(), dg->name); */
}
GB_validate_defgroups(m_bmesh, m_defbase);
}