2.5 merged 20773:21020
authorMartin Poirier <theeth@yahoo.com>
Sat, 20 Jun 2009 03:38:34 +0000 (03:38 +0000)
committerMartin Poirier <theeth@yahoo.com>
Sat, 20 Jun 2009 03:38:34 +0000 (03:38 +0000)
20 files changed:
1  2 
release/ui/buttons_data_modifier.py
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/intern/action.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels.c
source/blender/editors/include/ED_screen.h
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_space.c

Simple merge
@@@ -118,7 -118,7 +118,8 @@@ int                ED_operator_node_active(struct bCo
  int           ED_operator_ipo_active(struct bContext *C);
  int           ED_operator_sequencer_active(struct bContext *C);
  int           ED_operator_image_active(struct bContext *C);
 +int           ED_operator_nla_active(struct bContext *C);
+ int           ED_operator_logic_active(struct bContext *C);
  
  int           ED_operator_object_active(struct bContext *C);
  int           ED_operator_editmesh(struct bContext *C);
@@@ -180,11 -179,11 +180,16 @@@ int ED_operator_image_active(bContext *
        return ed_spacetype_test(C, SPACE_IMAGE);
  }
  
 +int ED_operator_nla_active(bContext *C)
 +{
 +      return ed_spacetype_test(C, SPACE_NLA);
 +}
 +
+ int ED_operator_logic_active(bContext *C)
+ {
+       return ed_spacetype_test(C, SPACE_LOGIC);
+ }
  int ED_operator_object_active(bContext *C)
  {
        return NULL != CTX_data_active_object(C);
Simple merge
@@@ -1767,60 -1819,59 +1819,60 @@@ typedef struct RNAProcessItem 
  } RNAProcessItem;
  
  RNAProcessItem PROCESS_ITEMS[]= {
-       {"rna_rna.c", RNA_def_rna},
-       {"rna_ID.c", RNA_def_ID},
-       {"rna_texture.c", RNA_def_texture},
-       {"rna_action.c", RNA_def_action},
-       {"rna_animation.c", RNA_def_animation},
-       {"rna_actuator.c", RNA_def_actuator},
-       {"rna_armature.c", RNA_def_armature},
-       {"rna_brush.c", RNA_def_brush},
-       {"rna_camera.c", RNA_def_camera},
-       {"rna_cloth.c", RNA_def_cloth},
-       {"rna_color.c", RNA_def_color},
-       {"rna_constraint.c", RNA_def_constraint},
-       {"rna_context.c", RNA_def_context},
-       {"rna_controller.c", RNA_def_controller},
-       {"rna_curve.c", RNA_def_curve},
-       {"rna_fcurve.c", RNA_def_fcurve},
-       {"rna_fluidsim.c", RNA_def_fluidsim},
-       {"rna_group.c", RNA_def_group},
-       {"rna_image.c", RNA_def_image},
-       {"rna_key.c", RNA_def_key},
-       {"rna_lamp.c", RNA_def_lamp},
-       {"rna_lattice.c", RNA_def_lattice},
-       {"rna_main.c", RNA_def_main},
-       {"rna_material.c", RNA_def_material},
-       {"rna_mesh.c", RNA_def_mesh},
-       {"rna_meta.c", RNA_def_meta},
-       {"rna_modifier.c", RNA_def_modifier},
+       {"rna_rna.c", NULL, RNA_def_rna},
+       {"rna_ID.c", NULL, RNA_def_ID},
+       {"rna_texture.c", NULL, RNA_def_texture},
+       {"rna_action.c", NULL, RNA_def_action},
+       {"rna_animation.c", NULL, RNA_def_animation},
+       {"rna_actuator.c", NULL, RNA_def_actuator},
+       {"rna_armature.c", NULL, RNA_def_armature},
+       {"rna_brush.c", NULL, RNA_def_brush},
+       {"rna_camera.c", NULL, RNA_def_camera},
+       {"rna_cloth.c", NULL, RNA_def_cloth},
+       {"rna_color.c", NULL, RNA_def_color},
+       {"rna_constraint.c", NULL, RNA_def_constraint},
+       {"rna_context.c", NULL, RNA_def_context},
+       {"rna_controller.c", NULL, RNA_def_controller},
+       {"rna_curve.c", NULL, RNA_def_curve},
+       {"rna_fcurve.c", NULL, RNA_def_fcurve},
+       {"rna_fluidsim.c", NULL, RNA_def_fluidsim},
+       {"rna_group.c", NULL, RNA_def_group},
+       {"rna_image.c", NULL, RNA_def_image},
+       {"rna_key.c", NULL, RNA_def_key},
+       {"rna_lamp.c", NULL, RNA_def_lamp},
+       {"rna_lattice.c", NULL, RNA_def_lattice},
+       {"rna_main.c", "rna_main_api.c", RNA_def_main},
+       {"rna_material.c", NULL, RNA_def_material},
+       {"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
+       {"rna_meta.c", NULL, RNA_def_meta},
+       {"rna_modifier.c", NULL, RNA_def_modifier},
 +      {"rna_nla.c", RNA_def_nla},
-       {"rna_nodetree.c", RNA_def_nodetree},
-       {"rna_object.c", RNA_def_object},
-       {"rna_object_force.c", RNA_def_object_force},
-       {"rna_packedfile.c", RNA_def_packedfile},
-       {"rna_particle.c", RNA_def_particle},
-       {"rna_pose.c", RNA_def_pose},
-       {"rna_property.c", RNA_def_gameproperty},
-       {"rna_radio.c", RNA_def_radio},
-       {"rna_scene.c", RNA_def_scene},
-       {"rna_screen.c", RNA_def_screen},
-       {"rna_scriptlink.c", RNA_def_scriptlink},
-       {"rna_sensor.c", RNA_def_sensor},
-       {"rna_sequence.c", RNA_def_sequence},
-       {"rna_space.c", RNA_def_space},
-       {"rna_text.c", RNA_def_text},
-       {"rna_timeline.c", RNA_def_timeline_marker},
-       {"rna_sound.c", RNA_def_sound},
-       {"rna_ui.c", RNA_def_ui},
-       {"rna_userdef.c", RNA_def_userdef},
-       {"rna_vfont.c", RNA_def_vfont},
-       {"rna_vpaint.c", RNA_def_vpaint},
-       {"rna_wm.c", RNA_def_wm},
-       {"rna_world.c", RNA_def_world}, 
+       {"rna_nodetree.c", NULL, RNA_def_nodetree},
+       {"rna_object.c", "rna_object_api.c", RNA_def_object},
+       {"rna_object_force.c", NULL, RNA_def_object_force},
+       {"rna_packedfile.c", NULL, RNA_def_packedfile},
+       {"rna_particle.c", NULL, RNA_def_particle},
+       {"rna_pose.c", NULL, RNA_def_pose},
+       {"rna_property.c", NULL, RNA_def_gameproperty},
+       {"rna_radio.c", NULL, RNA_def_radio},
+       {"rna_scene.c", NULL, RNA_def_scene},
+       {"rna_screen.c", NULL, RNA_def_screen},
+       {"rna_scriptlink.c", NULL, RNA_def_scriptlink},
+       {"rna_sensor.c", NULL, RNA_def_sensor},
+       {"rna_sequence.c", NULL, RNA_def_sequence},
+       {"rna_space.c", NULL, RNA_def_space},
+       {"rna_text.c", NULL, RNA_def_text},
+       {"rna_timeline.c", NULL, RNA_def_timeline_marker},
+       {"rna_sound.c", NULL, RNA_def_sound},
+       {"rna_ui.c", "rna_ui_api.c", RNA_def_ui},
+       {"rna_userdef.c", NULL, RNA_def_userdef},
+       {"rna_vfont.c", NULL, RNA_def_vfont},
+       {"rna_vpaint.c", NULL, RNA_def_vpaint},
+       {"rna_wm.c", "rna_wm_api.c", RNA_def_wm},
+       {"rna_world.c", NULL, RNA_def_world},   
        {NULL, NULL}};
  
- static void rna_generate(BlenderRNA *brna, FILE *f, char *filename)
+ static void rna_generate(BlenderRNA *brna, FILE *f, char *filename, char *api_filename)
  {
        StructDefRNA *ds;
        PropertyDefRNA *dp;
@@@ -279,13 -279,12 +279,13 @@@ static void rna_def_fmodifier_generator
        PropertyRNA *prop;
        
        static EnumPropertyItem prop_type_items[] = {
-               {0, "SIN", "Sine", ""},
-               {1, "COS", "Cosine", ""},
-               {2, "TAN", "Tangent", ""},
-               {3, "SQRT", "Square Root", ""},
-               {4, "LN", "Natural Logarithm", ""},
-               {5, "SINC", "Normalised Sine", "sin(x) / x"},
-               {0, NULL, NULL, NULL}};
+               {0, "SIN", 0, "Sine", ""},
+               {1, "COS", 0, "Cosine", ""},
+               {2, "TAN", 0, "Tangent", ""},
+               {3, "SQRT", 0, "Square Root", ""},
+               {4, "LN", 0, "Natural Logarithm", ""},
++              {5, "SINC", 0, "Normalised Sine", "sin(x) / x"},
+               {0, NULL, 0, NULL, NULL}};
                
        
        srna= RNA_def_struct(brna, "FModifierGenerator_Function", "FModifier");