[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55056] tags/blender-2.66a-release/blender : svn merge ^/trunk/ blender -c54904 -c54936 -c54937 -c55010 -c55011 -c55012 -c55021 -c55027 -c55028 -c55047 -c55048 -c55051

Campbell Barton ideasman42 at gmail.com
Tue Mar 5 15:43:08 CET 2013


Revision: 55056
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55056
Author:   campbellbarton
Date:     2013-03-05 14:43:07 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c54904 -c54936 -c54937 -c55010 -c55011 -c55012 -c55021 -c55027 -c55028 -c55047 -c55048 -c55051

Modified Paths:
--------------
    tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py
    tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_tracking.h
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/blender.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/node.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/tracking.c
    tags/blender-2.66a-release/blender/source/blender/blenloader/intern/writefile.c
    tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.cpp
    tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.h
    tags/blender-2.66a-release/blender/source/blender/editors/interface/interface_draw.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_node/node_relationships.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_sequencer/space_sequencer.c
    tags/blender-2.66a-release/blender/source/blender/imbuf/intern/colormanagement.c
    tags/blender-2.66a-release/blender/source/blender/imbuf/intern/imageprocess.c
    tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_space_types.h
    tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_space.c
    tags/blender-2.66a-release/blender/source/blender/windowmanager/intern/wm_operators.c
    tags/blender-2.66a-release/blender/source/blender/windowmanager/intern/wm_playanim.c
    tags/blender-2.66a-release/blender/source/blender/windowmanager/wm_event_types.h

Property Changed:
----------------
    tags/blender-2.66a-release/blender/


Property changes on: tags/blender-2.66a-release/blender
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012,55022,55026
   + /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903-54904,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54937,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012,55021-55022,55026-55028,55047-55048,55051

Modified: tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_sequencer.py	2013-03-05 14:43:07 UTC (rev 55056)
@@ -89,6 +89,7 @@
                 layout.separator()
                 layout.operator("sequencer.refresh_all")
 
+            layout.prop(st, "preview_channels", expand=True, text="")
             layout.prop(st, "display_channel", text="Channel")
 
             ed = context.scene.sequence_editor

Modified: tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_tracking.h	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_tracking.h	2013-03-05 14:43:07 UTC (rev 55056)
@@ -162,7 +162,7 @@
 /* **** Image sampling **** */
 struct ImBuf *BKE_tracking_sample_pattern(int frame_width, int frame_height,
                                           struct ImBuf *struct_ibuf, struct MovieTrackingTrack *track,
-                                          struct MovieTrackingMarker *marker, int use_mask,
+                                          struct MovieTrackingMarker *marker, int from_anchor, int use_mask,
                                           int num_samples_x, int num_samples_y, float pos[2]);
 struct ImBuf *BKE_tracking_get_pattern_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
                                              struct MovieTrackingMarker *marker, int anchored, int disable_channels);

Modified: tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/blender.c	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/blender.c	2013-03-05 14:43:07 UTC (rev 55056)
@@ -899,7 +899,9 @@
 {
 	if (vid) {
 		ID *id = vid;
-		id->flag |= LIB_NEED_EXPAND | LIB_DOIT;
+		/* only tag for need-expand if not done, prevents eternal loops */
+		if ((id->flag & LIB_DOIT) == 0)
+			id->flag |= LIB_NEED_EXPAND | LIB_DOIT;
 	}
 }
 

Modified: tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/node.c	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/node.c	2013-03-05 14:43:07 UTC (rev 55056)
@@ -571,6 +571,12 @@
 					link->fromnode = fromlink->fromnode;
 					link->fromsock = fromlink->fromsock;
 					
+					/* if the up- or downstream link is invalid,
+					 * the replacement link will be invalid too.
+					 */
+					if (!(fromlink->flag & NODE_LINK_VALID))
+						link->flag &= ~NODE_LINK_VALID;
+					
 					ntree->update |= NTREE_UPDATE_LINKS;
 				}
 				else

Modified: tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/tracking.c	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/tracking.c	2013-03-05 14:43:07 UTC (rev 55056)
@@ -1677,7 +1677,7 @@
 
 ImBuf *BKE_tracking_sample_pattern(int frame_width, int frame_height, ImBuf *search_ibuf,
                                    MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                                   int use_mask, int num_samples_x, int num_samples_y,
+                                   int from_anchor, int use_mask, int num_samples_x, int num_samples_y,
                                    float pos[2])
 {
 #ifdef WITH_LIBMV
@@ -1697,6 +1697,28 @@
 
 	get_marker_coords_for_tracking(frame_width, frame_height, marker, src_pixel_x, src_pixel_y);
 
+	/* from_anchor means search buffer was obtained for an anchored position,
+	 * which means applying track offset rounded to pixel space (we could not
+	 * store search buffer with sub-pixel precision)
+	 *
+	 * in this case we need to alter coordinates a bit, to compensate rounded
+	 * fractional part of offset
+	 */
+	if (from_anchor) {
+		int a;
+
+		for (a = 0; a < 5; a++) {
+			src_pixel_x[a] += ((track->offset[0] * frame_width) - ((int) (track->offset[0] * frame_width)));
+			src_pixel_y[a] += ((track->offset[1] * frame_height) - ((int) (track->offset[1] * frame_height)));
+
+			/* when offset is negative, rounding happens in opposite direction */
+			if (track->offset[0] < 0.0f)
+				src_pixel_x[a] += 1.0f;
+			if (track->offset[1] < 0.0f)
+				src_pixel_y[a] += 1.0f;
+		}
+	}
+
 	if (use_mask) {
 		mask = BKE_tracking_track_get_mask(frame_width, frame_height, track, marker);
 	}
@@ -1757,7 +1779,7 @@
 
 	if (search_ibuf) {
 		pattern_ibuf = BKE_tracking_sample_pattern(ibuf->x, ibuf->y, search_ibuf, track, marker,
-		                                           FALSE, num_samples_x, num_samples_y, NULL);
+		                                           anchored, FALSE, num_samples_x, num_samples_y, NULL);
 
 		IMB_freeImBuf(search_ibuf);
 	}

Modified: tags/blender-2.66a-release/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/blenloader/intern/writefile.c	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/source/blender/blenloader/intern/writefile.c	2013-03-05 14:43:07 UTC (rev 55056)
@@ -796,14 +796,15 @@
 static void write_renderinfo(WriteData *wd, Main *mainvar)
 {
 	bScreen *curscreen;
-	Scene *sce;
+	Scene *sce, *curscene = NULL;
 	RenderInfo data;
 
 	/* XXX in future, handle multiple windows with multiple screens? */
 	current_screen_compat(mainvar, &curscreen);
-
+	if (curscreen) curscene = curscreen->scene;
+	
 	for (sce= mainvar->scene.first; sce; sce= sce->id.next) {
-		if (sce->id.lib == NULL && (sce == curscreen->scene || (sce->r.scemode & R_BG_RENDER))) {
+		if (sce->id.lib == NULL && (sce == curscene || (sce->r.scemode & R_BG_RENDER))) {
 			data.sfra = sce->r.sfra;
 			data.efra = sce->r.efra;
 			memset(data.scene_name, 0, sizeof(data.scene_name));

Modified: tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.cpp
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.cpp	2013-03-05 14:42:06 UTC (rev 55055)
+++ tags/blender-2.66a-release/blender/source/blender/compositor/operations/COM_TextureOperation.cpp	2013-03-05 14:43:07 UTC (rev 55056)
@@ -25,7 +25,7 @@
 #include "BLI_listbase.h"
 #include "BKE_image.h"
 
-TextureBaseOperation::TextureBaseOperation() : NodeOperation()
+TextureBaseOperation::TextureBaseOperation() : SingleThreadedNodeOperation()
 {
 	this->addInputSocket(COM_DT_VECTOR); //offset
 	this->addInputSocket(COM_DT_VECTOR); //size
@@ -48,6 +48,7 @@
 	this->m_inputOffset = getInputSocketReader(0);
 	this->m_inputSize = getInputSocketReader(1);
 	this->m_pool = BKE_image_pool_new();
+	SingleThreadedNodeOperation::initExecution();
 }
 void TextureBaseOperation::deinitExecution()
 {
@@ -55,6 +56,7 @@
 	this->m_inputOffset = NULL;
 	BKE_image_pool_free(this->m_pool);
 	this->m_pool = NULL;
+	SingleThreadedNodeOperation::deinitExecution();
 }
 
 void TextureBaseOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
@@ -89,8 +91,8 @@
 	int retval;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list