diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-15 13:00:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-15 13:00:40 +0400 |
| commit | a28b9512fe51a829cbab692f7505d9aa66a9ad5e (patch) | |
| tree | 0b22a40d0752a62a9c7eec932624907debef03eb /source/blender/blenkernel/BKE_object.h | |
| parent | a6645bfafb75f9688f8446904682143fbf7b63e3 (diff) | |
made texflag a short everywhere (only stores one flag)
fix for crash with separate (missing NULL check)
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 1cb6efeb838..aeb33cd3628 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -114,7 +114,7 @@ int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3 void object_handle_update(struct Scene *scene, struct Object *ob); float give_timeoffset(struct Object *ob); -int give_obdata_texspace(struct Object *ob, int **texflag, float **loc, float **size, float **rot); +int give_obdata_texspace(struct Object *ob, short **texflag, float **loc, float **size, float **rot); int object_insert_ptcache(struct Object *ob); // void object_delete_ptcache(struct Object *ob, int index); |