[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47424] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47413:47423

Campbell Barton ideasman42 at gmail.com
Mon Jun 4 18:57:01 CEST 2012


Revision: 47424
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47424
Author:   campbellbarton
Date:     2012-06-04 16:56:51 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47413:47423

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

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/bvh/bvh_binning.cpp
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/editors/render/render_internal.c

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-47413
   + /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-47423

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-06-04 16:42:58 UTC (rev 47423)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-06-04 16:56:51 UTC (rev 47424)
@@ -236,6 +236,7 @@
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
+option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
 set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)

Modified: branches/soc-2011-tomato/intern/cycles/bvh/bvh_binning.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/bvh/bvh_binning.cpp	2012-06-04 16:42:58 UTC (rev 47423)
+++ branches/soc-2011-tomato/intern/cycles/bvh/bvh_binning.cpp	2012-06-04 16:56:51 UTC (rev 47424)
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+//#define __KERNEL_SSE__
+
 #include <stdlib.h>
 
 #include "bvh_binning.h"

Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-06-04 16:42:58 UTC (rev 47423)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-06-04 16:56:51 UTC (rev 47424)
@@ -1210,7 +1210,6 @@
 		if (old==entry->newp && entry->nr==ID_ID) {
 			entry->newp = new;
 			if (new) entry->nr = GS( ((ID *)new)->name );
-			break;
 		}
 	}
 }
@@ -7593,9 +7592,36 @@
 		}
 	}
 
+
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
 	{
+		/* set new deactivation values for game settings */
+		Scene *sce;
+
+		for (sce = main->scene.first; sce; sce = sce->id.next) {
+			/* Game Settings */
+			sce->gm.lineardeactthreshold = 0.8f;
+			sce->gm.angulardeactthreshold = 1.0f;
+			sce->gm.deactivationtime = 2.0f;
+		}
+	}
+
+	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
+	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
+	{
+		Scene *scene;
+		// composite redesign
+		for (scene=main->scene.first; scene; scene=scene->id.next) {
+			if (scene->nodetree) {
+				if (scene->nodetree->chunksize == 0) {
+					scene->nodetree->chunksize = 256;
+				}
+			}
+		}
+	}
+
+	{
 		MovieClip *clip;
-		bScreen *sc;
 
 		for (clip = main->movieclip.first; clip; clip = clip->id.next) {
 			MovieTrackingTrack *track;
@@ -7632,7 +7658,11 @@
 				track = track->next;
 			}
 		}
+	}
 
+	{
+		bScreen *sc;
+
 		for (sc = main->screen.first; sc; sc = sc->id.next) {
 			ScrArea *sa;
 
@@ -7652,33 +7682,6 @@
 		}
 	}
 
-	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
-	{
-		/* set new deactivation values for game settings */
-		Scene *sce;
-
-		for (sce = main->scene.first; sce; sce = sce->id.next) {
-			/* Game Settings */
-			sce->gm.lineardeactthreshold = 0.8f;
-			sce->gm.angulardeactthreshold = 1.0f;
-			sce->gm.deactivationtime = 2.0f;
-		}
-	}
-
-	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
-	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
-	{
-		Scene *scene;
-		// composite redesign
-		for (scene=main->scene.first; scene; scene=scene->id.next) {
-			if (scene->nodetree) {
-				if (scene->nodetree->chunksize == 0) {
-					scene->nodetree->chunksize = 256;
-				}
-			}
-		}
-	}
-	
 	/* don't forget to set version number in blender.c! */
 }
 


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-47413
   + /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-47423

Modified: branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/render/render_internal.c	2012-06-04 16:42:58 UTC (rev 47423)
+++ branches/soc-2011-tomato/source/blender/editors/render/render_internal.c	2012-06-04 16:56:51 UTC (rev 47424)
@@ -288,11 +288,12 @@
 	else if (scene->r.scemode & R_SINGLE_LAYER)
 		spos += sprintf(spos, "Single Layer | ");
 
+	spos += sprintf(spos, "Frame:%d ", (scene->r.cfra));
+
 	if (rs->statstr) {
-		spos += sprintf(spos, "%s ", rs->statstr);
+		spos += sprintf(spos, "| %s ", rs->statstr);
 	}
 	else {
-		spos += sprintf(spos, "Fra:%d  ", (scene->r.cfra));
 		if (rs->totvert) spos += sprintf(spos, "Ve:%d ", rs->totvert);
 		if (rs->totface) spos += sprintf(spos, "Fa:%d ", rs->totface);
 		if (rs->tothalo) spos += sprintf(spos, "Ha:%d ", rs->tothalo);


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-47413
   + /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-47423




More information about the Bf-blender-cvs mailing list