[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60053] trunk/blender/source/blender: code cleanup: set enums as static or add RNA_enum_types. h where they are used elsewhere.

Campbell Barton ideasman42 at gmail.com
Wed Sep 11 23:27:14 CEST 2013


Revision: 60053
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60053
Author:   campbellbarton
Date:     2013-09-11 21:27:14 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
code cleanup: set enums as static or add RNA_enum_types.h where they are used elsewhere.
also minor style cleanup.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c
    trunk/blender/source/blender/makesrna/intern/rna_action.c
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c
    trunk/blender/source/blender/makesrna/intern/rna_animviz.c
    trunk/blender/source/blender/makesrna/intern/rna_armature.c
    trunk/blender/source/blender/makesrna/intern/rna_boid.c
    trunk/blender/source/blender/makesrna/intern/rna_brush.c
    trunk/blender/source/blender/makesrna/intern/rna_constraint.c
    trunk/blender/source/blender/makesrna/intern/rna_controller.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
    trunk/blender/source/blender/makesrna/intern/rna_key.c
    trunk/blender/source/blender/makesrna/intern/rna_mask.c
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c
    trunk/blender/source/blender/makesrna/intern/rna_meta.c
    trunk/blender/source/blender/makesrna/intern/rna_nla.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_packedfile.c
    trunk/blender/source/blender/makesrna/intern/rna_particle.c
    trunk/blender/source/blender/makesrna/intern/rna_property.c
    trunk/blender/source/blender/makesrna/intern/rna_rigidbody.c
    trunk/blender/source/blender/makesrna/intern/rna_sensor.c
    trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_texture.c
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c
    trunk/blender/source/blender/makesrna/intern/rna_wm.c

Modified: trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -367,7 +367,7 @@
 	/* create detailed mesh triangles  - copy only valid triangles
 	 * and reserve memory for adjacency info */
 	dtris = MEM_callocN(sizeof(unsigned short) * 3 * 2 * ndtris, "buildNavMeshData dtris");
-	memset(dtris, 0xffff, sizeof(unsigned short) * 3 * 2 * ndtris);
+	memset(dtris, 0xff, sizeof(unsigned short) * 3 * 2 * ndtris);
 	for (i = 0; i < ndtris; i++) {
 		memcpy(dtris + 3 * 2 * i, tris + 3 * dtrisToTrisMap[i], sizeof(unsigned short) * 3);
 	}

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -3363,10 +3363,10 @@
 		    next_plane_marker &&
 		    (plane_track->flag & PLANE_TRACK_AUTOKEY))
 		{
-			float fac = ((float) next_plane_marker->framenr - start_plane_marker->framenr)
-			          / ((float) keyframe_plane_marker->framenr - start_plane_marker->framenr);
+			float fac = ((float) next_plane_marker->framenr - start_plane_marker->framenr) /
+			            ((float) keyframe_plane_marker->framenr - start_plane_marker->framenr);
 
-			fac = 3*fac*fac - 2*fac*fac*fac;
+			fac = 3 * fac * fac - 2 * fac * fac * fac;
 
 			for (i = 0; i < 4; i++) {
 				interp_v2_v2v2(new_plane_marker.corners[i], new_plane_marker.corners[i],

Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -36,6 +36,7 @@
 
 #include "RNA_access.h"
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
 
 #include "WM_types.h"
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_action.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_action.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -490,7 +490,7 @@
 	prop = RNA_def_property(srna, "channels", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "channels", NULL);
 	RNA_def_property_struct_type(prop, "FCurve");
-	RNA_def_property_collection_funcs(prop, 0, "rna_ActionGroup_channels_next", NULL, NULL, NULL, NULL, NULL, NULL);
+	RNA_def_property_collection_funcs(prop, NULL, "rna_ActionGroup_channels_next", NULL, NULL, NULL, NULL, NULL, NULL);
 	RNA_def_property_ui_text(prop, "Channels", "F-Curves in this group");
 	
 	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);

Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -45,7 +45,7 @@
 #include "WM_types.h"
 
 /* Always keep in alphabetical order */
-EnumPropertyItem actuator_type_items[] = {
+static EnumPropertyItem actuator_type_items[] = {
 	{ACT_ACTION, "ACTION", 0, "Action", ""},
 	{ACT_ARMATURE, "ARMATURE", 0, "Armature", ""},
 	{ACT_CAMERA, "CAMERA", 0, "Camera", ""},

Modified: trunk/blender/source/blender/makesrna/intern/rna_animviz.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animviz.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_animviz.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -26,8 +26,6 @@
 
 #include <stdlib.h>
 
-#include "RNA_define.h"
-
 #include "DNA_anim_types.h"
 #include "DNA_action_types.h"
 #include "DNA_scene_types.h"
@@ -36,6 +34,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
 #include "rna_internal.h"
 
 #include "WM_types.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -921,7 +921,7 @@
 	/* Collections */
 	prop = RNA_def_property(srna, "bones", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "bonebase", NULL);
-	RNA_def_property_collection_funcs(prop, 0, "rna_Armature_bones_next", NULL, NULL, NULL, NULL, NULL, NULL);
+	RNA_def_property_collection_funcs(prop, NULL, "rna_Armature_bones_next", NULL, NULL, NULL, NULL, NULL, NULL);
 	RNA_def_property_struct_type(prop, "Bone");
 	RNA_def_property_ui_text(prop, "Bones", "");
 	rna_def_armature_bones(brna, prop);

Modified: trunk/blender/source/blender/makesrna/intern/rna_boid.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_boid.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_boid.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -41,6 +41,7 @@
 #include "BLI_utildefines.h"
 
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
 
 #include "rna_internal.h"
 
@@ -69,7 +70,8 @@
 	{0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem boidruleset_type_items[] = {
+#ifndef RNA_RUNTIME
+static EnumPropertyItem boidruleset_type_items[] = {
 	{eBoidRulesetType_Fuzzy, "FUZZY", 0, "Fuzzy",
 	                         "Rules are gone through top to bottom (only the first rule which effect is above "
 	                         "fuzziness threshold is evaluated)"},
@@ -77,6 +79,7 @@
 	{eBoidRulesetType_Average, "AVERAGE", 0, "Average", "All rules are averaged"},
 	{0, NULL, 0, NULL, NULL}
 };
+#endif
 
 
 #ifdef RNA_RUNTIME

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "RNA_define.h"
-
 #include "DNA_brush_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_scene_types.h"
@@ -36,6 +34,9 @@
 
 #include "BLI_math.h"
 
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
 #include "rna_internal.h"
 
 #include "IMB_imbuf.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_constraint.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -465,7 +465,7 @@
 
 #else
 
-EnumPropertyItem constraint_distance_items[] = {
+static EnumPropertyItem constraint_distance_items[] = {
 	{LIMITDIST_INSIDE, "LIMITDIST_INSIDE", 0, "Inside",
 	                   "The object is constrained inside a virtual sphere around the target object, "
 	                   "with a radius defined by the limit distance"},

Modified: trunk/blender/source/blender/makesrna/intern/rna_controller.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_controller.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_controller.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -34,6 +34,7 @@
 #include "BLF_translation.h"
 
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
 
 #include "rna_internal.h"
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -46,13 +46,15 @@
 #include "BKE_curve.h"
 #include "ED_curve.h"
 
-EnumPropertyItem beztriple_handle_type_items[] = {
+#ifndef RNA_RUNTIME
+static EnumPropertyItem beztriple_handle_type_items[] = {
 	{HD_FREE, "FREE", 0, "Free", ""},
 	{HD_VECT, "VECTOR", 0, "Vector", ""},
 	{HD_ALIGN, "ALIGNED", 0, "Aligned", ""},
 	{HD_AUTO, "AUTO", 0, "Auto", ""},
 	{0, NULL, 0, NULL, NULL}
 };
+#endif
 		
 EnumPropertyItem keyframe_handle_type_items[] = {
 	{HD_FREE, "FREE", 0, "Free", ""},
@@ -70,7 +72,8 @@
 	{0, NULL, 0, NULL, NULL}
 };
 
-EnumPropertyItem curve_type_items[] = {
+#ifndef RNA_RUNTIME
+static EnumPropertyItem curve_type_items[] = {
 	{CU_POLY, "POLY", 0, "Poly", ""},
 	{CU_BEZIER, "BEZIER", 0, "Bezier", ""},
 	{CU_BSPLINE, "BSPLINE", 0, "BSpline", ""},
@@ -78,6 +81,7 @@
 	{CU_NURBS, "NURBS", 0, "Ease", ""},
 	{0, NULL, 0, NULL, NULL}
 };
+#endif
 
 static const EnumPropertyItem curve3d_fill_mode_items[] = {
 	{0, "FULL", 0, "Full", ""},
@@ -1488,7 +1492,7 @@
 	RNA_def_property_struct_type(prop, "Material");
 	RNA_def_property_ui_text(prop, "Materials", "");
 	RNA_def_property_srna(prop, "IDMaterials"); /* see rna_ID.c */
-	RNA_def_property_collection_funcs(prop, 0, NULL, NULL, NULL, NULL, NULL, NULL, "rna_IDMaterials_assign_int");
+	RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "rna_IDMaterials_assign_int");
 
 	prop = RNA_def_property(srna, "bevel_factor_start", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "bevfac1");

Modified: trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c	2013-09-11 21:23:09 UTC (rev 60052)
+++ trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c	2013-09-11 21:27:14 UTC (rev 60053)
@@ -39,6 +39,7 @@
 #include "DNA_scene_types.h"
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list