[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46823] trunk/blender/source/blender/ compositor/operations: == Compositor ==

[Peter Schlaile]

Revision: 46823
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46823
Author:   schlaile
Date:     2012-05-20 21:24:08 +0000 (Sun, 20 May 2012)
Log Message:
-----------
== Compositor ==

This fixes occasional crashes on uninitialized memory, when we open a blend 
file which has movie or image input nodes pointing to none existent 
source files.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp	2012-05-20 21:23:26 UTC (rev 46822)
+++ trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp	2012-05-20 21:24:08 UTC (rev 46823)
@@ -98,6 +98,10 @@
 void BaseImageOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	ImBuf *stackbuf = getImBuf();
+
+        resolution[0] = 0;
+        resolution[1] = 0;
+
 	if (stackbuf) {
 		resolution[0] = stackbuf->x;
 		resolution[1] = stackbuf->y;

Modified: trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp	2012-05-20 21:23:26 UTC (rev 46822)
+++ trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp	2012-05-20 21:24:08 UTC (rev 46823)
@@ -67,6 +67,10 @@
 void MovieClipOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	ImBuf *ibuf;
+
+        resolution[0] = 0;
+        resolution[1] = 0;
+
 	if (this->movieClip) {
 		ibuf = BKE_movieclip_get_ibuf(this->movieClip, this->movieClipUser);
 		if (ibuf) {