[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55584] trunk/blender/source/blender: misc minor changes

[Campbell Barton]

Revision: 55584
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55584
Author:   campbellbarton
Date:     2013-03-26 01:46:12 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
    trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
    trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-03-26 01:46:12 UTC (rev 55584)
@@ -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);
 }

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.h	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.h	2013-03-26 01:46:12 UTC (rev 55584)
@@ -34,7 +34,7 @@
 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);

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.c	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.c	2013-03-26 01:46:12 UTC (rev 55584)
@@ -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;

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.h	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.h	2013-03-26 01:46:12 UTC (rev 55584)
@@ -68,7 +68,7 @@
 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);

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2013-03-26 01:46:12 UTC (rev 55584)
@@ -2155,7 +2155,11 @@
 		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)

Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2013-03-26 01:46:12 UTC (rev 55584)
@@ -2075,7 +2075,7 @@
 
 	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);

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-03-26 01:43:00 UTC (rev 55583)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-03-26 01:46:12 UTC (rev 55584)
@@ -3711,7 +3711,7 @@
 	
 	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");