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

Merged changes in the trunk up to revision 47056.

Browse Source 
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
This commit is contained in:
Tamito Kajiyama
2012-05-26 22:22:45 +00:00
parent a5152b7ca0 eda0f3b186
commit b6a9a953bc
606 changed files with 34730 additions and 29015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/render/render_shading.c
View File

@@ -383,7 +383,7 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op))
if (BKE_scene_use_new_shading_nodes(scene)) {
ED_node_shader_default(scene, &ma->id);
ma->use_nodes = 1;
ma->use_nodes = TRUE;
}
}
@@ -483,7 +483,7 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op))
if (BKE_scene_use_new_shading_nodes(scene)) {
ED_node_shader_default(scene, &wo->id);
wo->use_nodes = 1;
wo->use_nodes = TRUE;
}
}