[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46461] tags/blender-2.63a-release/blender : blender 2.63a: merge last bunch of fixes for 'a' release

Sergey Sharybin sergey.vfx at gmail.com
Wed May 9 12:50:16 CEST 2012


Revision: 46461
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46461
Author:   nazgul
Date:     2012-05-09 10:50:16 +0000 (Wed, 09 May 2012)
Log Message:
-----------
blender 2.63a: merge last bunch of fixes for 'a' release

This merges commits form trunk: 46423, 46424, 46450, 46439, 46445, 46449, 46453, 46454

Changes checked up to rev46454

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46454

Modified Paths:
--------------
    tags/blender-2.63a-release/blender/intern/dualcon/intern/Projections.h
    tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/movieclip.c
    tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/node.c
    tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/tracking.c
    tags/blender-2.63a-release/blender/source/blender/blenloader/intern/readfile.c
    tags/blender-2.63a-release/blender/source/blender/collada/GeometryExporter.cpp
    tags/blender-2.63a-release/blender/source/blender/collada/InstanceWriter.cpp
    tags/blender-2.63a-release/blender/source/blender/editors/space_view3d/drawobject.c
    tags/blender-2.63a-release/blender/source/blender/makesrna/intern/rna_nodetree.c
    tags/blender-2.63a-release/blender/source/blender/render/intern/source/pipeline.c

Property Changed:
----------------
    tags/blender-2.63a-release/blender/
    tags/blender-2.63a-release/blender/source/blender/editors/space_outliner/


Property changes on: tags/blender-2.63a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /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
/trunk/blender:46003-46005,46014-46016,46027-46028,46035-46036,46039,46043,46072,46077,46085,46091,46093,46095,46116-46117,46120,46125,46127,46131,46136,46138,46140-46143,46148-46149,46152,46156-46160,46172,46178-46181,46183-46184,46192,46194,46196-46197,46205-46206,46213-46215,46222,46224-46236,46241,46246,46250,46253,46260-46261,46264-46265,46269,46273,46277-46278,46280,46282,46289-46290,46294,46305,46308,46310-46311,46316,46327,46336,46338,46341-46342,46345-46347,46354,46361-46363,46385,46391,46393,46410-46412,46416-46417
   + /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
/trunk/blender:46003-46005,46014-46016,46027-46028,46035-46036,46039,46043,46072,46077,46085,46091,46093,46095,46116-46117,46120,46125,46127,46131,46136,46138,46140-46143,46148-46149,46152,46156-46160,46172,46178-46181,46183-46184,46192,46194,46196-46197,46205-46206,46213-46215,46222,46224-46236,46241,46246,46250,46253,46260-46261,46264-46265,46269,46273,46277-46278,46280,46282,46289-46290,46294,46305,46308,46310-46311,46316,46327,46336,46338,46341-46342,46345-46347,46354,46361-46363,46385,46391,46393,46410-46412,46416-46417,46423-46424,46439,46445,46449-46450,46453-46454

Modified: tags/blender-2.63a-release/blender/intern/dualcon/intern/Projections.h
===================================================================
--- tags/blender-2.63a-release/blender/intern/dualcon/intern/Projections.h	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/intern/dualcon/intern/Projections.h	2012-05-09 10:50:16 UTC (rev 46461)
@@ -788,17 +788,17 @@
 		LONG proj0 = cubeProj[i][0] ;
 		LONG proj1 = cubeProj[i][0] + cubeProj[i][edgeInd + 1] ;
 		LONG proj2 = inherit->trigProj[i][1] ;
+		LONG d = proj1 - proj0;
+		double alpha;
 
-		// double alpha = (double)( ( proj2 - proj0 ) * cubeProj[edgeInd][edgeInd + 1] ) / (double)( proj1 - proj0 ) ;
-		double alpha = (double)( ( proj2 - proj0 ) ) / (double)( proj1 - proj0 ) ;
-		
-		if ( alpha < 0 )
-		{
-			alpha = 0.5 ;
+		if (d == 0) {
+			alpha = 0.5;
 		}
-		else if ( alpha > 1 )
-		{
-			alpha = 0.5 ;
+		else {
+			alpha = (double)((proj2 - proj0)) / (double)d;
+
+			if (alpha < 0 || alpha > 1)
+				alpha = 0.5;
 		}
 		
 

Modified: tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/movieclip.c	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/movieclip.c	2012-05-09 10:50:16 UTC (rev 46461)
@@ -1038,7 +1038,7 @@
 
 				scopes->track_disabled = FALSE;
 
-				if (ibuf && ibuf->rect) {
+				if (ibuf && (ibuf->rect || ibuf->rect_float)) {
 					ImBuf *tmpibuf;
 					MovieTrackingMarker undist_marker = *marker;
 

Modified: tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/node.c	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/node.c	2012-05-09 10:50:16 UTC (rev 46461)
@@ -339,15 +339,15 @@
 	
 	node_add_sockets_from_type(ntree, node, ntype);
 	
-	if (ntype->initfunc!=NULL)
-		ntype->initfunc(ntree, node, ntemp);
-	
 	/* initialize the node name with the node label */
 	BLI_strncpy(node->name, nodeLabel(node), NODE_MAXSTR);
 	nodeUniqueName(ntree, node);
 	
 	BLI_addtail(&ntree->nodes, node);
 	
+	if (ntype->initfunc!=NULL)
+		ntype->initfunc(ntree, node, ntemp);
+	
 	ntree->update |= NTREE_UPDATE_NODES;
 	
 	return node;

Modified: tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/tracking.c	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/source/blender/blenkernel/intern/tracking.c	2012-05-09 10:50:16 UTC (rev 46461)
@@ -1166,7 +1166,13 @@
 	x1 = x-(int)(w * (-min[0] / (max[0] - min[0])));
 	y1 = y-(int)(h * (-min[1] / (max[1] - min[1])));
 
-	tmpibuf = IMB_allocImBuf(w+margin*2, h+margin*2, 32, IB_rect);
+	if (ibuf->rect_float)
+		tmpibuf = IMB_allocImBuf(w + margin * 2, h + margin * 2, 32, IB_rectfloat);
+	else
+		tmpibuf = IMB_allocImBuf(w + margin * 2, h + margin * 2, 32, IB_rect);
+
+	tmpibuf->profile = ibuf->profile;
+
 	IMB_rectcpy(tmpibuf, ibuf, 0, 0, x1 - margin, y1 - margin, w + margin * 2, h + margin * 2);
 
 	if (pos != NULL) {

Modified: tags/blender-2.63a-release/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- tags/blender-2.63a-release/blender/source/blender/blenloader/intern/readfile.c	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/source/blender/blenloader/intern/readfile.c	2012-05-09 10:50:16 UTC (rev 46461)
@@ -7706,10 +7706,15 @@
 			bNodeSocket *old_image = BLI_findlink(&node->inputs, 0);
 			bNodeSocket *old_z = BLI_findlink(&node->inputs, 1);
 			bNodeSocket *sock;
+			char basepath[FILE_MAXDIR];
+			char filename[FILE_MAXFILE];
 			
 			node->storage= nimf;
 			
-			BLI_strncpy(nimf->base_path, old_data->name, sizeof(nimf->base_path));
+			/* split off filename from the old path, to be used as socket sub-path */
+			BLI_split_dirfile(old_data->name, basepath, filename, sizeof(basepath), sizeof(filename));
+			
+			BLI_strncpy(nimf->base_path, basepath, sizeof(nimf->base_path));
 			nimf->format = old_data->im_format;
 			
 			/* if z buffer is saved, change the image type to multilayer exr.
@@ -7717,21 +7722,32 @@
 			 * i'm just assuming here that IRIZ means IRIS with z buffer ...
 			 */
 			if (ELEM(old_data->im_format.imtype, R_IMF_IMTYPE_IRIZ, R_IMF_IMTYPE_OPENEXR)) {
+				char sockpath[FILE_MAX];
+				
 				nimf->format.imtype = R_IMF_IMTYPE_MULTILAYER;
-				sock = ntreeCompositOutputFileAddSocket(ntree, node, old_image->name, &nimf->format);
+				
+				BLI_snprintf(sockpath, sizeof(sockpath), "%s_Image", filename);
+				sock = ntreeCompositOutputFileAddSocket(ntree, node, sockpath, &nimf->format);
+				/* XXX later do_versions copies path from socket name, need to set this explicitely */
+				BLI_strncpy(sock->name, sockpath, sizeof(sock->name));
 				if (old_image->link) {
 					old_image->link->tosock = sock;
 					sock->link = old_image->link;
 				}
-				sock = ntreeCompositOutputFileAddSocket(ntree, node, old_z->name, &nimf->format);
+				
+				BLI_snprintf(sockpath, sizeof(sockpath), "%s_Z", filename);
+				sock = ntreeCompositOutputFileAddSocket(ntree, node, sockpath, &nimf->format);
+				/* XXX later do_versions copies path from socket name, need to set this explicitely */
+				BLI_strncpy(sock->name, sockpath, sizeof(sock->name));
 				if (old_z->link) {
 					old_z->link->tosock = sock;
 					sock->link = old_z->link;
 				}
 			}
 			else {
-				/* saves directly to base path, which is the old image output path */
-				sock = ntreeCompositOutputFileAddSocket(ntree, node, "", &nimf->format);
+				sock = ntreeCompositOutputFileAddSocket(ntree, node, filename, &nimf->format);
+				/* XXX later do_versions copies path from socket name, need to set this explicitely */
+				BLI_strncpy(sock->name, filename, sizeof(sock->name));
 				if (old_image->link) {
 					old_image->link->tosock = sock;
 					sock->link = old_image->link;

Modified: tags/blender-2.63a-release/blender/source/blender/collada/GeometryExporter.cpp
===================================================================
--- tags/blender-2.63a-release/blender/source/blender/collada/GeometryExporter.cpp	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/source/blender/collada/GeometryExporter.cpp	2012-05-09 10:50:16 UTC (rev 46461)
@@ -177,7 +177,7 @@
 	// sets material name
 	if (ma) {
 		std::ostringstream ostr;
-		ostr << translate_id(id_name(ma)) << material_index+1;
+		ostr << translate_id(id_name(ma));
 		polylist.setMaterial(ostr.str());
 	}
 			

Modified: tags/blender-2.63a-release/blender/source/blender/collada/InstanceWriter.cpp
===================================================================
--- tags/blender-2.63a-release/blender/source/blender/collada/InstanceWriter.cpp	2012-05-09 10:48:24 UTC (rev 46460)
+++ tags/blender-2.63a-release/blender/source/blender/collada/InstanceWriter.cpp	2012-05-09 10:50:16 UTC (rev 46461)
@@ -52,7 +52,7 @@
 			std::string matid(get_material_id(ma));
 			matid = translate_id(matid);
 			std::ostringstream ostr;
-			ostr << translate_id(id_name(ma)) << a+1;
+			ostr << translate_id(id_name(ma));
 			COLLADASW::InstanceMaterial im(ostr.str(), COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid));
 			
 			// create <bind_vertex_input> for each uv map


Property changes on: tags/blender-2.63a-release/blender/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
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list