svn merge ^/trunk/blender -r47413:47423
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2012 16:56:51 +0000 (16:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2012 16:56:51 +0000 (16:56 +0000)
CMakeLists.txt
intern/cycles/bvh/bvh_binning.cpp
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_internal.c

index 29a255d6c67cc151442a0a291c2f139ba4cb77fc..f50ef91c978118b6661a61d222d3e3f998e4c188 100644 (file)
@@ -236,6 +236,7 @@ endif()
 # 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)
index cb0d994723712bc6315947bd36ba60a34e3883a3..e4b88584a33c9290b32501f2a32cbb8ee094dac3 100644 (file)
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+//#define __KERNEL_SSE__
+
 #include <stdlib.h>
 
 #include "bvh_binning.h"
index 70bcf6c758ec51204e4133971681589165db3f45..4c82e10d717f545325d8d48781b8e4371096aa92 100644 (file)
@@ -1210,7 +1210,6 @@ static void change_idid_adr_fd(FileData *fd, void *old, void *new)
                if (old==entry->newp && entry->nr==ID_ID) {
                        entry->newp = new;
                        if (new) entry->nr = GS( ((ID *)new)->name );
-                       break;
                }
        }
 }
@@ -7593,9 +7592,36 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                }
        }
 
+
+       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,6 +7658,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                track = track->next;
                        }
                }
+       }
+
+       {
+               bScreen *sc;
 
                for (sc = main->screen.first; sc; sc = sc->id.next) {
                        ScrArea *sa;
@@ -7652,33 +7682,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                }
        }
 
-       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! */
 }
 
index 356ede878b53cc8b603d3ac513700f911f215668..8fa3c6f992ffcf8c495830a34451a28b6a012e79 100644 (file)
@@ -288,11 +288,12 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
        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);