Revision: 45415
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45415
Author:   jbakker
Date:     2012-04-05 06:46:18 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
TileBranch
 * Fixed issue with Stabilize2d node.
reason of crash:
 - the resolution of the movie clip attribute operation was set to the default 
values
 - the system did a translate operation to center this
 - these new added operations crashed the system

Modified Paths:
--------------
    
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
    
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h

Modified: 
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
===================================================================
--- 
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
      2012-04-05 06:26:18 UTC (rev 45414)
+++ 
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
      2012-04-05 06:46:18 UTC (rev 45415)
@@ -25,7 +25,6 @@
        #include "BKE_tracking.h"
 }
 MovieClipAttributeOperation::MovieClipAttributeOperation(): NodeOperation() {
-       this->addInputSocket(COM_DT_COLOR);
     this->addOutputSocket(COM_DT_VALUE);
        this->valueSet = false;
        this->framenumber = 0;
@@ -60,3 +59,9 @@
        }
        outputValue[0] = this->value;
 }
+
+void MovieClipAttributeOperation::determineResolution(unsigned int 
resolution[], unsigned int preferredResolution[]) {
+       resolution[0] = preferredResolution[0];
+       resolution[1] = preferredResolution[1];
+}
+

Modified: 
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
===================================================================
--- 
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
        2012-04-05 06:26:18 UTC (rev 45414)
+++ 
branches/tile/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
        2012-04-05 06:46:18 UTC (rev 45415)
@@ -52,6 +52,7 @@
       * the inner loop of this program
       */
        void executePixel(float* color, float x, float y, PixelSampler sampler, 
MemoryBuffer *inputBuffers[]);
+       void determineResolution(unsigned int resolution[], unsigned int 
preferredResolution[]);
 
        void setMovieClip(MovieClip* clip) {this->clip = clip;}
        void setFramenumber(int framenumber) {this->framenumber = framenumber;}

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to