griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

misc minor changes

Browse Source 
- 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.
This commit is contained in:
Campbell Barton
2013-03-26 01:46:12 +00:00
parent 4fbf4590c9
commit 32f63f6b4c
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/bmesh/intern/bmesh_queries.c
View File

@@ -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);
}

2
source/blender/bmesh/intern/bmesh_queries.h
View File

@@ -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);

2
source/blender/bmesh/intern/bmesh_structure.c
View File

@@ -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;

2
source/blender/bmesh/intern/bmesh_structure.h
View File

@@ -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);

4
source/blender/editors/space_logic/logic_window.c
View File

@@ -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)

2
source/blender/makesrna/intern/rna_actuator.c
View File

@@ -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);

2
source/blender/makesrna/intern/rna_scene.c
View File

@@ -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");