[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60139] trunk/blender: minor style clanup and use more meaningful name for 3DCONNEXION source code .

[Campbell Barton]

Revision: 60139
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60139
Author:   campbellbarton
Date:     2013-09-14 12:04:10 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
minor style clanup and use more meaningful name for 3DCONNEXION source code.

Modified Paths:
--------------
    trunk/blender/intern/ghost/CMakeLists.txt
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/screen/area.c
    trunk/blender/source/blender/makesdna/DNA_mask_types.h
    trunk/blender/source/blender/makesdna/DNA_tracking_types.h

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt	2013-09-14 11:11:00 UTC (rev 60138)
+++ trunk/blender/intern/ghost/CMakeLists.txt	2013-09-14 12:04:10 UTC (rev 60139)
@@ -191,7 +191,7 @@
 				intern/GHOST_NDOFManagerCocoa.mm
 				intern/GHOST_NDOFManagerCocoa.h
 			)
-			list(APPEND SRC2
+			list(APPEND SRC_NDOF3DCONNEXION
 				intern/GHOST_NDOFManager3Dconnexion.c
 				intern/GHOST_NDOFManager3Dconnexion.h
 			)
@@ -323,6 +323,7 @@
 
 blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
 
-if(WITH_INPUT_NDOF AND WITH_COCOA) # workaround for apple clang mangling extern "C" symbols
-	blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC2}" "${INC}" "${INC_SYS}")
+# workaround for apple clang mangling extern "C" symbols
+if(WITH_INPUT_NDOF AND WITH_COCOA)
+	blender_add_lib(bf_intern_ghostndof3dconnexion "${SRC_NDOF3DCONNEXION}" "${INC}" "${INC_SYS}")
 endif()

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2013-09-14 11:11:00 UTC (rev 60138)
+++ trunk/blender/source/blender/editors/interface/interface.c	2013-09-14 12:04:10 UTC (rev 60139)
@@ -962,10 +962,12 @@
 						data_path = BLI_sprintfN("scene.%s", path);
 						MEM_freeN(path);
 					}
-					/*else {
-						printf("ERROR in %s(): Couldn't get path for scene property - %s\n", 
+#if 0
+					else {
+						printf("ERROR in %s(): Couldn't get path for scene property - %s\n",
 						       __func__, RNA_property_identifier(but->rnaprop));
-					}*/
+					}
+#endif
 				}
 			}
 			else {

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2013-09-14 11:11:00 UTC (rev 60138)
+++ trunk/blender/source/blender/editors/screen/area.c	2013-09-14 12:04:10 UTC (rev 60139)
@@ -1696,8 +1696,10 @@
 			/* Note: this code scales fine, but because of rounding differences, positions of elements
 			 * flip +1 or -1 pixel compared to redoing the entire layout again.
 			 * Leaving in commented code for future tests */
-			/* uiScalePanels(ar, BLI_rctf_size_x(&v2d->cur));
-			   break; */
+#if 0
+			uiScalePanels(ar, BLI_rctf_size_x(&v2d->cur));
+			break;
+#endif
 		}
 		else {
 			break;

Modified: trunk/blender/source/blender/makesdna/DNA_mask_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mask_types.h	2013-09-14 11:11:00 UTC (rev 60138)
+++ trunk/blender/source/blender/makesdna/DNA_mask_types.h	2013-09-14 12:04:10 UTC (rev 60139)
@@ -67,7 +67,7 @@
 	char sub_parent[64];  /* sub-entity of parent to which parenting happened
 	                       * in case of parenting to movie tracking data contains name of track */
 	float parent_orig[2]; /* track location at the moment of parenting,
-	                         stored in mask space*/
+	                       * stored in mask space*/
 
 	float parent_corners_orig[4][2]; /* Original corners of plane track at the moment of parenting */
 } MaskParent;

Modified: trunk/blender/source/blender/makesdna/DNA_tracking_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_tracking_types.h	2013-09-14 11:11:00 UTC (rev 60138)
+++ trunk/blender/source/blender/makesdna/DNA_tracking_types.h	2013-09-14 12:04:10 UTC (rev 60139)
@@ -170,7 +170,7 @@
 	char name[64];  /* MAX_NAME */
 
 	MovieTrackingTrack **point_tracks;  /* Array of point tracks used to define this plane.
-	                                       Each element is a pointer to MovieTrackingTrack. */
+	                                     * Each element is a pointer to MovieTrackingTrack. */
 	int point_tracksnr, pad;  /* Number of tracks in point_tracks array. */
 
 	MovieTrackingPlaneMarker *markers;   /* Markers in the plane track */