Cycles: svn merge -r36747:36777 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 19 May 2011 12:37:26 +0000 (12:37 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 19 May 2011 12:37:26 +0000 (12:37 +0000)
1  2 
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_space.c

index 2506c931eb48d8ffc2e0d246c8a037cf9d3f64ee,bad6c6248a106eaad6bde3bfebcd23a824bc0e01..b8f2e0f9b9ff65eaf216bc129b17b2927579c374
@@@ -867,11 -866,9 +867,12 @@@ Lamp *copy_lamp(Lamp *la
        }
        
        lan->curfalloff = curvemapping_copy(la->curfalloff);
 +
 +      if(la->nodetree)
 +              lan->nodetree= ntreeCopyTree(la->nodetree);
        
-       if (la->preview) lan->preview = BKE_previewimg_copy(la->preview);
+       if(la->preview)
+               lan->preview = BKE_previewimg_copy(la->preview);
        
        return lan;
  }
index 2e0eec4266904998f75650c7bbc78e305f385162,d413177873f3e6f3d8b549dbc177e2d68b1532e3..32b4a84c2378b2a8aa7d93415026794bf6f10019
@@@ -131,12 -123,10 +131,13 @@@ World *copy_world(World *wrld
                        id_us_plus((ID *)wrldn->mtex[a]->tex);
                }
        }
 +
 +      if(wrld->nodetree)
 +              wrldn->nodetree= ntreeCopyTree(wrld->nodetree);
        
-       if (wrld->preview) wrldn->preview = BKE_previewimg_copy(wrld->preview);
+       if(wrld->preview)
+               wrldn->preview = BKE_previewimg_copy(wrld->preview);
 -
 +      
        return wrldn;
  }