diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-04-14 14:37:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-14 14:37:58 +0400 |
commit | 0a411c47049378906d1a4c3df4d6b6cb9f87ca9e (patch) | |
tree | 49562bc9400c7a8e276f3f0df288e7888ae9df26 | |
parent | 61b6f47faf5b7bd2bbc0f6d6e32c628b757002be (diff) |
added missing 'import bpy' from uvcalc_smart_project
removed 2 unused vars from DNA_object_types.h
-rw-r--r-- | release/scripts/uvcalc_smart_project.py | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/release/scripts/uvcalc_smart_project.py b/release/scripts/uvcalc_smart_project.py index b4f69ce512e..ae6ffacf593 100644 --- a/release/scripts/uvcalc_smart_project.py +++ b/release/scripts/uvcalc_smart_project.py @@ -44,7 +44,7 @@ selected faces, or all faces. from Blender import Object, Draw, Window, sys, Mesh, Geometry from Blender.Mathutils import CrossVecs, Matrix, Vector, RotationMatrix, DotVecs - +import bpy from math import cos DEG_TO_RAD = 0.017453292519943295 # pi/180.0 diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 7411c439243..228b9bcc90e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -89,7 +89,6 @@ typedef struct Object { short type, partype; int par1, par2, par3; /* can be vertexnrs */ char parsubstr[32]; /* String describing subobject info */ - void *pardata; struct Object *parent, *track; /* if ob->proxy (or proxy_group), this object is proxy for object ob->proxy */ /* proxy_from is set in target back to the proxy. */ @@ -149,13 +148,13 @@ typedef struct Object { * For a Sphere, the form factor is by default = 0.4 */ - float formfactor, softtime; /* softtime temp for softbody, remove it before release! */ + float formfactor; float rdamping, sizefac; char dt, dtx; char totcol; /* copy of mesh or curve or meta */ char actcol; - char empty_drawtype, pad1[3]; + char empty_drawtype, pad1[7]; float empty_drawsize; ScriptLink scriptlink; |