Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-01-23 23:36:47 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-01-23 23:36:47 +0300
commitc86579b11e6fe140f07029469e3644d7dbe0640e (patch)
treed27544e7f183f016be96c0c7d391ec9823b8c391 /source/blender/blenkernel/intern
parent4531e8e6a731af71936d09bb79a15297685ff0dc (diff)
2.5: multiple small fixes
- wm draw method is now initialized correct when reading older files, but the SDNA bug causing the problem is still unsolved. is due to // char pad[8]; not being recognized as commented. - triple buffer proxy texture test follows spec better now, was disabling triple buffer unnecessarily on some drivers. - some cmake compile fixes related to sequencer pthread usage and removed bad level calls lib for player. - show outliner header buttons in oops mode as well until that can be switched in the UI. - fix region data free issue for tooltips - warning fixes
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/exotic.c2
-rw-r--r--source/blender/blenkernel/intern/idprop.c2
-rw-r--r--source/blender/blenkernel/intern/multires.c2
-rw-r--r--source/blender/blenkernel/intern/screen.c3
4 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 9c5d67660ba..249d3db9423 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -2387,7 +2387,7 @@ void write_stl(Scene *scene, char *str)
static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
{
- Mesh *me;
+ Mesh *me= ob->data;
EditMesh *em = me->edit_mesh;
Material *ma;
MFace *mface;
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 4cd282e094e..c2474e847ae 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -215,7 +215,7 @@ void IDP_ResizeArray(IDProperty *prop, int newlen)
/*first check if the array buffer size has room*/
/*if newlen is 200 chars less then totallen, reallocate anyway*/
if (newlen <= prop->totallen && prop->totallen - newlen < 200) {
- idp_resize_group_array(prop, newlen, newarr);
+ idp_resize_group_array(prop, newlen, prop->data.pointer);
prop->len = newlen;
return;
}
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index ec4b8eb6d03..a09a428dc06 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -428,7 +428,7 @@ void multiresModifier_del_levels(struct MultiresModifierData *mmd, struct Object
void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int distance, int updateblock, int simple)
{
DerivedMesh *final = NULL;
- int totsubvert, totsubface, totsubedge;
+ int totsubvert = 0, totsubface = 0, totsubedge = 0;
Mesh *me = get_mesh(ob);
MDisps *mdisps;
int i;
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 96dddb908d2..ce5225d50b9 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -223,6 +223,9 @@ void BKE_area_region_free(SpaceType *st, ARegion *ar)
if(art && art->free)
art->free(ar);
}
+ else if(ar->type && ar->type->free)
+ ar->type->free(ar);
+
if(ar) {
if(ar->regiondata)
printf("regiondata free error\n");