Merged changes in the trunk up to revision 34828.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Feb 2011 23:47:30 +0000 (23:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Feb 2011 23:47:30 +0000 (23:47 +0000)
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

32 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/creator/CMakeLists.txt
source/creator/creator.c

index 2efffa520d87e159e85866a047c75263ae698b2a,5dfed9ccb2050157b8fc9a98f65a44fccf1fb6ed..e522fdd2dcba779cf050f749d75a949419976b87
@@@ -965,9 -673,9 +965,9 @@@ class RENDER_PT_bake(RenderButtonsPanel
          sub.prop(rd, "bake_distance")
          sub.prop(rd, "bake_bias")
  
 -
 +        
  def register():
-     pass
+     bpy.utils.register_module(__name__)
  
  
  def unregister():
Simple merge
Simple merge
index 58167a866a3dc54817e86352af55c88ae142f0bf,99fcd3f4a505fa6da39ec1bd3aced8bc4d8254f1..28410a7cc0eb10ae7042803a8619b210fe2297d7
@@@ -423,10 -418,8 +423,10 @@@ ListBase *which_libbase(Main *mainlib, 
                        return &(mainlib->wm);
                case ID_GD:
                        return &(mainlib->gpencil);
 +              case ID_LS:
 +                      return &(mainlib->linestyle);
        }
-       return 0;
+       return NULL;
  }
  
  /* Flag all ids in listbase */
Simple merge
Simple merge
index fa35b8fac1533af631ce634de6cfad8e7ae64abc,722facf4ea8e90cd7dd8428107a21c948c7997a5..bc20ef710eb722302334ec938d2eed78447efbed
@@@ -96,10 -96,11 +96,15 @@@ extern EnumPropertyItem property_unit_i
  
  extern EnumPropertyItem viewport_shade_items[];
  
+ extern EnumPropertyItem node_blend_type_items[];
+ extern EnumPropertyItem node_math_items[];
+ extern EnumPropertyItem node_vec_math_items[];
+ extern EnumPropertyItem node_filter_items[];
 +extern EnumPropertyItem linestyle_color_modifier_type_items[];
 +extern EnumPropertyItem linestyle_alpha_modifier_type_items[];
 +extern EnumPropertyItem linestyle_thickness_modifier_type_items[];
 +
  struct bContext;
  struct PointerRNA;
  EnumPropertyItem *rna_TransformOrientation_itemf(struct bContext *C, struct PointerRNA *ptr, int *free);
Simple merge
Simple merge
Simple merge