diff options
author | Thomas Dinges <blender@dingto.org> | 2009-06-06 20:18:19 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2009-06-06 20:18:19 +0400 |
commit | 895d76dab5b8e140a8b1bc15ce5417c2a8c97871 (patch) | |
tree | e36bcaeb37215322021b0ab375bfc2c782d05d9d /source | |
parent | 9d8fa4f959ff704e113d70ed713d1b8aec0ef014 (diff) |
2.5 Interface:
* Added a constraint tab in the buttons window.
* Added more sequencer buttons (effect strips).
Note: Sequencer buttons will go into the sequencer itself (n-key Panel) later.
* Particle button tweaks by William Reynish. Thanks!
* Some RNA fixes and new properties.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_header.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 19 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequence.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 1 |
7 files changed, 28 insertions, 5 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 029fc75f0ae..9ad54361ef8 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -317,6 +317,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path) break; case BCONTEXT_OBJECT: case BCONTEXT_PHYSICS: + case BCONTEXT_CONSTRAINT: case BCONTEXT_MODIFIER: found= buttons_context_path_object(path); break; diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 316cb0e08b5..444db92265d 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -195,6 +195,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) // Specific panels, check on active object seletion if(ob) { uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, "Object"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, "Constraint"); if(ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER, xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, "Modifier"); diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 35b398fbbb7..c8724cae9e6 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -194,6 +194,8 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) ED_region_panels(C, ar, vertical, "bone"); else if(sbuts->mainb == BCONTEXT_MODIFIER) ED_region_panels(C, ar, vertical, "modifier"); + else if (sbuts->mainb == BCONTEXT_CONSTRAINT) + ED_region_panels(C, ar, vertical, "constraint"); sbuts->re_align= 0; sbuts->mainbo= sbuts->mainb; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index b32be6cb369..eccaf318e9c 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -478,6 +478,7 @@ typedef struct SpaceImaSel { #define BCONTEXT_BONE 9 #define BCONTEXT_MODIFIER 10 #define BCONTEXT_SEQUENCER 11 +#define BCONTEXT_CONSTRAINT 12 /* sbuts->flag */ diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index c3e1931c439..afa45834eb0 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -223,6 +223,16 @@ static void rna_def_field(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Radial Falloff Power", "Radial falloff power (real gravitational falloff = 2)"); + prop= RNA_def_property(srna, "texture_nabla", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "tex_nabla"); + RNA_def_property_range(prop, 0.0001f, 1.0f); + RNA_def_property_ui_text(prop, "Nabla", "Defines size of derivative offset used for calculating gradient and curl"); + + prop= RNA_def_property(srna, "noise", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "f_noise"); + RNA_def_property_range(prop, 0.0f, 10.0f); + RNA_def_property_ui_text(prop, "Noise", "Noise of the wind force"); + /* Boolean */ prop= RNA_def_property(srna, "use_min_distance", PROP_BOOLEAN, PROP_NONE); @@ -267,9 +277,16 @@ static void rna_def_field(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_TEX_2D); RNA_def_property_ui_text(prop, "2D", "Apply force only in 2d"); - prop= RNA_def_property(srna, "root_coords", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "root_coordinates", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_TEX_ROOTCO); RNA_def_property_ui_text(prop, "Root Texture Coordinates", "Texture coordinates from root particle locations"); + + /* Pointer */ + + prop= RNA_def_property(srna, "texture", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "tex"); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_ui_text(prop, "Texture", "Texture to use as force"); } static void rna_def_game_softbody(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c index 813a3bf39e8..fc42c4f3f73 100644 --- a/source/blender/makesrna/intern/rna_sequence.c +++ b/source/blender/makesrna/intern/rna_sequence.c @@ -839,17 +839,17 @@ static void rna_def_speed_control(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Global Speed", ""); RNA_def_property_ui_range(prop, 0.0f, 100.0f, 1, 0); - prop= RNA_def_property(srna, "ipo_velocity", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "curve_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_INTEGRATE); - RNA_def_property_ui_text(prop, "IPO Velocity", "Interpret the IPO value as a velocity instead of a frame number."); + RNA_def_property_ui_text(prop, "F-Curve Velocity", "Interpret the F-Curve value as a velocity instead of a frame number."); prop= RNA_def_property(srna, "frame_blending", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_BLEND); RNA_def_property_ui_text(prop, "Frame Blending", "Blend two frames into the target for a smoother result."); - prop= RNA_def_property(srna, "ipo_compress_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "curve_compress_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_COMPRESS_IPO_Y); - RNA_def_property_ui_text(prop, "IPO Compress Y", "Scale IPO value to get the target frame number, IPO value runs from 0.0 to 1.0."); + RNA_def_property_ui_text(prop, "F-Curve Compress Y", "Scale F-Curve value to get the target frame number, F-Curve value runs from 0.0 to 1.0."); } void RNA_def_sequence(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index fc0cd36c1ad..e9c6ce8156f 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -489,6 +489,7 @@ static void rna_def_space_buttons(BlenderRNA *brna) {BCONTEXT_BONE, "BONE", "Bone", ""}, {BCONTEXT_MODIFIER, "MODIFIER", "Modifier", ""}, {BCONTEXT_SEQUENCER, "SEQUENCER", "Sequencer", ""}, + {BCONTEXT_CONSTRAINT, "CONSTRAINT", "Constraint", ""}, {0, NULL, NULL, NULL}}; static EnumPropertyItem panel_alignment_items[] = { |