Revision: 28604
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28604
Author:   broken
Date:     2010-05-06 05:15:14 +0200 (Thu, 06 May 2010)

Log Message:
-----------
Fix [#22246] Invisible objects on 3D-View (patch included)

Modified patch by Teppo K?\195?\164ns?\195?\164l?\195?\164, thanks for finding 
the issue!

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2010-05-06 
02:58:36 UTC (rev 28603)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2010-05-06 
03:15:14 UTC (rev 28604)
@@ -10748,6 +10748,27 @@
                        }
                } /* sequencer changes */
        }
+       
+       if (main->versionfile <= 251) { /* 2.5.1 had no subversions */
+               bScreen *sc;
+               
+               /* Blender 2.5.2 - subversion 0 introduced a new setting: 
V3D_RENDER_OVERRIDE.
+                * This bit was used in the past for V3D_TRANSFORM_SNAP, which 
is now deprecated. 
+                * Here we clear it for old files so they don't come in with 
V3D_RENDER_OVERRIDE set,
+                * which would cause cameras, lamps, etc to become invisible */
+               for(sc= main->screen.first; sc; sc= sc->id.next) {
+                       ScrArea *sa;
+                       for(sa= sc->areabase.first; sa; sa= sa->next) {
+                               SpaceLink *sl;
+                               for (sl= sa->spacedata.first; sl; sl= sl->next) 
{
+                                       if(sl->spacetype==SPACE_VIEW3D) {
+                                               View3D* v3d = (View3D *)sl;
+                                               v3d->flag2 &= 
~V3D_RENDER_OVERRIDE;
+                                       }
+                               }
+                       }
+               }
+       }
 
        if (main->versionfile < 252 || (main->versionfile == 252 && 
main->subversionfile < 1)) {
                Brush *brush;


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

Reply via email to