diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-26 05:46:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-26 05:46:12 +0400 |
commit | 32f63f6b4c09e610fe5fa3f3081259fedccc5ad9 (patch) | |
tree | 0f1b894d3836caa61b4023293bbf367e9f790132 | |
parent | 4fbf4590c9042b1e10ba194f1d613953490303ff (diff) |
misc minor changes
- make it clear that navmesh visualize option only works in path mode.
- use 2 decimal places for motion-blur shutter speed (user request).
- use 'const' for some bmesh functions.
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_structure.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_structure.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 26b0e42a1c1..44392383925 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -43,7 +43,7 @@ * Returns whether or not a given vertex is * is part of a given edge. */ -bool BM_vert_in_edge(BMEdge *e, BMVert *v) +bool BM_vert_in_edge(const BMEdge *e, const BMVert *v) { return bmesh_vert_in_edge(e, v); } diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_queries.h index f894912aad3..8326709a2eb 100644 --- a/source/blender/bmesh/intern/bmesh_queries.h +++ b/source/blender/bmesh/intern/bmesh_queries.h @@ -34,7 +34,7 @@ bool BM_verts_in_face(BMFace *f, BMVert **varr, int len); bool BM_edge_in_face(BMFace *f, BMEdge *e); bool BM_edge_in_loop(BMEdge *e, BMLoop *l); -bool BM_vert_in_edge(BMEdge *e, BMVert *v); +bool BM_vert_in_edge(const BMEdge *e, const BMVert *v); bool BM_verts_in_edge(BMVert *v1, BMVert *v2, BMEdge *e); float BM_edge_calc_length(BMEdge *e); diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c index 0398f9c558f..a0907f0db7a 100644 --- a/source/blender/bmesh/intern/bmesh_structure.c +++ b/source/blender/bmesh/intern/bmesh_structure.c @@ -40,7 +40,7 @@ * MISC utility functions. */ -bool bmesh_vert_in_edge(BMEdge *e, BMVert *v) +bool bmesh_vert_in_edge(const BMEdge *e, const BMVert *v) { if (e->v1 == v || e->v2 == v) return true; return false; diff --git a/source/blender/bmesh/intern/bmesh_structure.h b/source/blender/bmesh/intern/bmesh_structure.h index e67f1e4fb49..f10e3a12377 100644 --- a/source/blender/bmesh/intern/bmesh_structure.h +++ b/source/blender/bmesh/intern/bmesh_structure.h @@ -68,7 +68,7 @@ BMLoop *bmesh_radial_faceloop_find_vert(BMFace *f, BMVert *v); bool bmesh_radial_validate(int radlen, BMLoop *l); /* EDGE UTILITIES */ -bool bmesh_vert_in_edge(BMEdge *e, BMVert *v); +bool bmesh_vert_in_edge(const BMEdge *e, const BMVert *v); bool bmesh_verts_in_edge(BMVert *v1, BMVert *v2, BMEdge *e); bool bmesh_edge_swapverts(BMEdge *e, BMVert *orig, BMVert *newv); /* relink edge */ BMVert *bmesh_edge_other_vert_get(BMEdge *e, BMVert *v); diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 992f09c5a84..578006115a5 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -2155,7 +2155,11 @@ static void draw_actuator_steering(uiLayout *layout, PointerRNA *ptr) uiItemR(row, ptr, "update_period", 0, NULL, ICON_NONE); row = uiLayoutRow(layout, FALSE); } + row = uiLayoutRow(layout, FALSE); uiItemR(row, ptr, "show_visualization", 0, NULL, ICON_NONE); + if (RNA_enum_get(ptr, "mode") != ACT_STEERING_PATHFOLLOWING) { + uiLayoutSetActive(row, FALSE); + } } static void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C) diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index d258c686b99..97ccdae089d 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -2075,7 +2075,7 @@ static void rna_def_steering_actuator(BlenderRNA *brna) prop = RNA_def_property(srna, "show_visualization", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ACT_STEERING_ENABLEVISUALIZATION); - RNA_def_property_ui_text(prop, "Visualize", "Enable debug visualization"); + RNA_def_property_ui_text(prop, "Visualize", "Enable debug visualization for 'Path following'"); RNA_def_property_update(prop, NC_LOGIC, NULL); prop = RNA_def_property(srna, "update_period", PROP_INT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 297af940d2c..997a9d5a260 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3711,7 +3711,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "blurfac"); - RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 1); + RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 2); RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update"); |