Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 19 Sep 2011 14:20:15 +0000 (14:20 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 19 Sep 2011 14:20:15 +0000 (14:20 +0000)
28 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/imbuf/CMakeLists.txt
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/windowmanager/intern/wm_init_exit.c

diff --cc CMakeLists.txt
Simple merge
index 33207bbc763f0e197a5e5c4a729bb92f76d009e4,a966caa4d7062ca3945f4184fb561c68a8c85294..2490bd33101b81121e7ce58068d38a7e40eb6afa
@@@ -3596,40 -3534,9 +3596,40 @@@ void NODE_OT_add_file(wmOperatorType *o
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
        
        WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH);  //XXX TODO, relative_path
-       RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Datablock name to assign.");
+       RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Datablock name to assign");
  }
  
 +/* ****************** Auto Layout Operator  ******************* */
 +
 +static int node_auto_layout_exec(bContext *C, wmOperator *UNUSED(op))
 +{
 +      SpaceNode *snode= CTX_wm_space_node(C);
 +      bNode *node;
 +
 +      for(node=snode->edittree->nodes.first; node; node=node->next)
 +              if(node->flag & SELECT)
 +                      ED_node_tree_auto_layout(snode->edittree, node);
 +
 +      snode_notify(C, snode);
 +      
 +      return OPERATOR_FINISHED;
 +}
 +
 +void NODE_OT_auto_layout(wmOperatorType *ot)
 +{
 +      /* identifiers */
 +      ot->name= "Auto Layout Nodes";
 +      ot->description= "Automatically layout nodes with the selected nodes as root";
 +      ot->idname= "NODE_OT_auto_layout";
 +      
 +      /* callbacks */
 +      ot->exec= node_auto_layout_exec;
 +      ot->poll= ED_operator_node_active;
 +      
 +      /* flags */
 +      ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 +}
 +
  /********************** New node tree operator *********************/
  
  static int new_node_tree_exec(bContext *C, wmOperator *op)
index 836204dcb7a2be59aec0248ae6f365946825087b,26be64bc268977713f4c5e0d0e71d61ab6a16d63..c22db44034e93aaf1cb9aa0fad37345b42842a16
@@@ -63,9 -62,7 +62,8 @@@ set(SR
        intern/md5.c
        intern/metadata.c
        intern/module.c
 +      intern/openimageio.cpp
        intern/png.c
-       intern/radiance_hdr.c
        intern/readimage.c
        intern/rectop.c
        intern/rotate.c
Simple merge
index 59579e42b076898a51d0ed8dc02fd4366db96120,dcaeb523df53cd932f029fdecb776561f052fb31..f102b700bb4c81d37a807ee9b077137a7efb5836
@@@ -276,10 -277,11 +277,11 @@@ static void rna_Material_use_nodes_set(
  
        ma->use_nodes= value;
        if(ma->use_nodes && ma->nodetree==NULL)
 -              ED_node_shader_default(ma);
 +              ED_node_shader_default(&ma->id);
  }
  
- static EnumPropertyItem *rna_Material_texture_coordinates_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free)
+ static EnumPropertyItem *rna_Material_texture_coordinates_itemf(bContext *UNUSED(C), PointerRNA *ptr,
+                                                                 PropertyRNA *UNUSED(prop), int *free)
  {
        Material *ma= (Material*)ptr->id.data;
        EnumPropertyItem *item= NULL;
index 53c71c42f7c4d1fa46bb05ffd12556af1806564e,84c3d2fd68b09bb1f2764c1d3037c4d59d01625e..8f32bc7da2e8b1a91cf43699582e4cd4186cca78
@@@ -286,10 -286,10 +286,10 @@@ static void dupli_render_particle_set(S
                dupli_render_particle_set(scene, go->ob, level+1, enable);
  }
  /* When no longer needed, duplilist should be freed with Object.free_duplilist */
 -static void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce)
 +void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce)
  {
        if (!(ob->transflag & OB_DUPLI)) {
-               BKE_report(reports, RPT_ERROR, "Object does not have duplis.");
+               BKE_report(reports, RPT_ERROR, "Object does not have duplis");
                return;
        }