Merged changes in the trunk up to revision 28536.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 2 May 2010 23:10:22 +0000 (23:10 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 2 May 2010 23:10:22 +0000 (23:10 +0000)
17 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c

index be6485e79577486206386d3c9a81095614c1d81c,b6137e271b999f5b1ff7ebfc65cba3074402ed94..abed887610ff0c0cfafc22391fe1f88f95d34959
@@@ -120,18 -124,12 +124,13 @@@ class RENDER_PT_layers(RenderButtonsPan
          col.prop(rl, "solid")
          col.prop(rl, "halo")
          col.prop(rl, "ztransp")
 -
 -        col = split.column()
          col.prop(rl, "sky")
 +              
 +        col = split.column()
          col.prop(rl, "edge")
          col.prop(rl, "strand")
 +        col.prop(rl, "freestyle")
  
-         if rl.zmask:
-             split = layout.split()
-             split.label(text="Zmask Layers:")
-             split.column().prop(rl, "zmask_layers", text="")
          layout.separator()
  
          split = layout.split()
          col.prop(rl, "pass_diffuse")
          row = col.row()
          row.prop(rl, "pass_specular")
-         row.prop(rl, "pass_specular_exclude", text="", icon='X')
+         row.prop(rl, "pass_specular_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_shadow")
-         row.prop(rl, "pass_shadow_exclude", text="", icon='X')
+         row.prop(rl, "pass_shadow_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_emit")
-         row.prop(rl, "pass_emit_exclude", text="", icon='X')
+         row.prop(rl, "pass_emit_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_ao")
-         row.prop(rl, "pass_ao_exclude", text="", icon='X')
+         row.prop(rl, "pass_ao_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_environment")
-         row.prop(rl, "pass_environment_exclude", text="", icon='X')
+         row.prop(rl, "pass_environment_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_indirect")
-         row.prop(rl, "pass_indirect_exclude", text="", icon='X')
+         row.prop(rl, "pass_indirect_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_reflection")
-         row.prop(rl, "pass_reflection_exclude", text="", icon='X')
+         row.prop(rl, "pass_reflection_exclude", text="")
          row = col.row()
          row.prop(rl, "pass_refraction")
-         row.prop(rl, "pass_refraction_exclude", text="", icon='X')
+         row.prop(rl, "pass_refraction_exclude", text="")
  
 +        if rl.freestyle:
 +            layout.separator()
 +
 +            split = layout.split()
 +
 +            col = split.column()
 +            col.label(text="Freestyle:")
 +            freestyle = rl.freestyle_settings
 +            col.prop(freestyle, "sphere_radius", text="Sphere Radius")
 +            col.prop(freestyle, "ridges_and_valleys", text="Ridges and Valleys")
 +            col.prop(freestyle, "suggestive_contours", text="Suggestive Contours")
 +            col.prop(freestyle, "dkr_epsilon", text="Dkr Epsilon")
 +
 +            col.operator("scene.freestyle_module_add", text="Add Style Module")
 +
 +            for i, module in enumerate(freestyle.modules):
 +                    box = layout.box()
 +                    box.set_context_pointer("freestyle_module", module)
 +                    row = box.row(align=True)
 +                    row.prop(module, "is_displayed", text="")
 +                    row.prop(module, "module_path", text="")
 +                    row.operator("scene.freestyle_module_remove", icon='X', text="")
 +                    props = row.operator("scene.freestyle_module_move_up", icon='MOVE_UP_VEC', text="")
 +                    props.active = (i > 0)
 +                    props = row.operator("scene.freestyle_module_move_down", icon='MOVE_DOWN_VEC', text="")
 +                    props.active = (i < len(freestyle.modules) - 1)
 +
  
  class RENDER_PT_shading(RenderButtonsPanel):
      bl_label = "Shading"
Simple merge
Simple merge
index 9bc73dddf2248768e614142e9aa9f803415223d4,2d9f6f29ab95cee1dcf2cfa809d205597287594c..6d792355322dff75ba8fc908176a14509d339286
@@@ -1801,18 -1747,9 +1810,19 @@@ static void rna_def_scene_render_layer(
  
        srna= RNA_def_struct(brna, "SceneRenderLayer", NULL);
        RNA_def_struct_ui_text(srna, "Scene Render Layer", "Render layer");
+       RNA_def_struct_ui_icon(srna, ICON_RENDERLAYERS);
  
        rna_def_render_layer_common(srna, 1);
 +
 +      /* Freestyle */
 +
 +      rna_def_freestyle_settings(brna);
 +
 +      prop= RNA_def_property(srna, "freestyle_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_flag(prop, PROP_NEVER_NULL);
 +      RNA_def_property_pointer_sdna(prop, NULL, "freestyleConfig");
 +      RNA_def_property_struct_type(prop, "FreestyleSettings");
 +      RNA_def_property_ui_text(prop, "Freestyle Settings", "");
  }
  
  static void rna_def_scene_render_data(BlenderRNA *brna)
Simple merge
Simple merge
Simple merge