archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r43676:43685

Browse Source
This commit is contained in:
Campbell Barton
2012-01-24 22:44:48 +00:00
parent 3f31145d29 1aadbdedc7
commit 75a4832af3
7 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/ui.py
View 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'}

2
release/scripts/startup/bl_ui/space_node.py
View 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)

3
source/blender/blenkernel/intern/particle_system.c
View 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;
}

6
source/blender/editors/space_node/space_node.c
View 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)

2
source/blender/makesrna/intern/rna_access.c
View 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:

2
source/blender/makesrna/intern/rna_object_api.c
View 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 */

4
source/blender/windowmanager/intern/wm_operators.c
View 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