[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34454] trunk/blender/source/blender/ editors/object/object_relations.c: Bugfix #25761

[Ton Roosendaal]

Revision: 34454
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34454
Author:   ton
Date:     2011-01-22 15:34:20 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
Bugfix #25761

Move-to-layer in 3D window didn't work for linked library objects.
That should be possible, as was in 2.49. Layer property is local.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c      
2011-01-22 14:44:04 UTC (rev 34453)
+++ trunk/blender/source/blender/editors/object/object_relations.c      
2011-01-22 15:34:20 UTC (rev 34454)
@@ -1050,7 +1050,8 @@
        unsigned int lay= 0;
 
        if(!RNA_property_is_set(op->ptr, "layers")) {
-               CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+               /* note: layers are set in bases, library objects work for this 
*/
+               CTX_DATA_BEGIN(C, Base*, base, selected_bases) {
                        lay |= base->lay;
                }
                CTX_DATA_END;
@@ -1098,8 +1099,8 @@
        
        if(v3d && v3d->localvd) {
                /* now we can move out of localview. */
-               // XXX if (!okee("Move from localview")) return;
-               CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+               /* note: layers are set in bases, library objects work for this 
*/
+               CTX_DATA_BEGIN(C, Base*, base, selected_bases) {
                        lay= base->lay & ~v3d->lay;
                        base->lay= lay;
                        base->object->lay= lay;
@@ -1111,7 +1112,8 @@
        }
        else {
                /* normal non localview operation */
-               CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+               /* note: layers are set in bases, library objects work for this 
*/
+               CTX_DATA_BEGIN(C, Base*, base, selected_bases) {
                        /* upper byte is used for local view */
                        local= base->lay & 0xFF000000;  
                        base->lay= lay + local;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs