svn merge ^/trunk/blender -r43676:43685
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 22:44:48 +0000 (22:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 22:44:48 +0000 (22:44 +0000)
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_node.py
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/space_node/space_node.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/windowmanager/intern/wm_operators.c

index f44c04e36f81063cb4092915c7c5d834a2f92237..763cff0bd7d90bd2314873fb4d4d00dc7fd5994a 100644 (file)
@@ -241,7 +241,7 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
 
 
 class Cycles_PT_context_material(CyclesButtonsPanel, Panel):
-    bl_label = "Surface"
+    bl_label = ""
     bl_context = "material"
     bl_options = {'HIDE_HEADER'}
 
index e1a599dca2e59fc8ad7afdba1fdb296e10e477da..d29dff491329c490c1b8386cf8ed20f844602c8c 100644 (file)
@@ -61,6 +61,8 @@ class NODE_HT_header(Header):
                     
             if snode.shader_type == 'WORLD':
                 layout.template_ID(scene, "world", new="world.new")
+                if snode_id:
+                    layout.prop(snode_id, "use_nodes")
 
         elif snode.tree_type == 'TEXTURE':
             layout.prop(snode, "texture_type", text="", expand=True)
index 7e69e67fca72824096b37e9aad53ab4fe685747a..69ddcd21cb9500c56fda6d6f45d01bb61f334f1a 100644 (file)
@@ -1127,6 +1127,9 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D
                        fprintf(stderr,"Particle distribution error: Nothing to emit from!\n");
 
                if(dm != finaldm) dm->release(dm);
+
+               BLI_kdtree_free(tree);
+
                return 0;
        }
 
index 9d4c5705bd17821b2b60f39edbcd45578b010b82..493fb8545854cfb5b1727fb60cca20d9dba86958 100644 (file)
@@ -169,6 +169,7 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
        /* note, ED_area_tag_refresh will re-execute compositor */
        SpaceNode *snode= sa->spacedata.first;
        int type= snode->treetype;
+       short shader_type = snode->shaderfrom;
        
        /* preview renders */
        switch(wmn->category) {
@@ -214,6 +215,11 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
                                        ED_area_tag_refresh(sa);
                        }
                        break;
+               case NC_WORLD:
+                       if(type==NTREE_SHADER && shader_type==SNODE_SHADER_WORLD) {
+                               ED_area_tag_refresh(sa);        
+                       }
+                       break;
                case NC_OBJECT:
                        if(type==NTREE_SHADER) {
                                if(wmn->data==ND_OB_SHADING)
index 4eebfc529203dcae641dc7cb2e8e777c9c1e6e39..7d366afd3cac95a330dabde7adf6dd1fcc4520ae 100644 (file)
@@ -4746,7 +4746,7 @@ ParameterList *RNA_parameter_list_create(ParameterList *parms, PointerRNA *UNUSE
                                case PROP_STRING: {
                                        const char *defvalue= ((StringPropertyRNA*)parm)->defaultvalue;
                                        if(defvalue && defvalue[0])
-                                               memcpy(data, &defvalue, size);
+                                               BLI_strncpy(data, defvalue, size);
                                        break;
                                }
                                case PROP_POINTER:
index fc313d3b1deda6774b266e21f5fdc6712020ff09..6783e5d4788ac8415ca3a7b72ee56390c167faa0 100644 (file)
@@ -643,7 +643,7 @@ void RNA_api_object(StructRNA *srna)
        parm= RNA_def_enum(func, "type", mesh_dm_info_items, 0, "", "Modifier settings to apply");
        RNA_def_property_flag(parm, PROP_REQUIRED);
        /* weak!, no way to return dynamic string type */
-       parm= RNA_def_string(func, "result", "result", 16384, "result", "");
+       parm= RNA_def_string(func, "result", "", 16384, "result", "");
        RNA_def_property_flag(parm, PROP_THICK_WRAP); /* needed for string return value */
        RNA_def_function_output(func, parm);
 #endif /* NDEBUG */
index 4cf36de7f5f05b9b8d935292dbed738b49dcc6d6..faf2d3fd352c82fe8d92b704ae3f638464393756 100644 (file)
@@ -2166,7 +2166,7 @@ static void WM_OT_collada_export(wmOperatorType *ot)
        ot->exec= wm_collada_export_exec;
        ot->poll= WM_operator_winactive;
        
-       WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH);
+       WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
        RNA_def_boolean(ot->srna, "selected", 0, "Export only selected",
                "Export only selected elements");
 }
@@ -2198,7 +2198,7 @@ static void WM_OT_collada_import(wmOperatorType *ot)
        ot->exec= wm_collada_import_exec;
        ot->poll= WM_operator_winactive;
        
-       WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
+       WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 }
 
 #endif