Revision: 47215
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47215
Author: campbellbarton
Date: 2012-05-30 09:28:37 +0000 (Wed, 30 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47210:47214
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47210
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryManagerState.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47210
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47214
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-05-30 09:27:16 UTC (rev 47214)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-05-30 09:28:37 UTC (rev 47215)
@@ -4052,7 +4052,16 @@
warn = 1;
if (ob->pose) {
+ /* we can't call #BKE_pose_free() here
because of library linking
+ * freeing will recurse down into every
pose constraints ID pointers
+ * which are not always valid, so for
now free directly and suffer
+ * some leaked memory rather then
crashing immediately
+ * while bad this _is_ an exceptional
case - campbell */
+#if 0
BKE_pose_free(ob->pose);
+#else
+ MEM_freeN(ob->pose);
+#endif
ob->pose= NULL;
ob->mode &= ~OB_MODE_POSE;
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryManagerState.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryManagerState.cpp
2012-05-30 09:27:16 UTC (rev 47214)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryManagerState.cpp
2012-05-30 09:28:37 UTC (rev 47215)
@@ -45,7 +45,7 @@
delete buffer;
}
}
- delete this->chunkBuffers;
+ delete [] this->chunkBuffers;
BLI_mutex_end(&this->mutex);
}
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47210
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47214
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-47210
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-47214
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
