[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29745] trunk/blender/source/blender: remove some warnings

Campbell Barton ideasman42 at gmail.com
Sun Jun 27 23:03:39 CEST 2010


Revision: 29745
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29745
Author:   campbellbarton
Date:     2010-06-27 23:03:39 +0200 (Sun, 27 Jun 2010)

Log Message:
-----------
remove some warnings

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/BLI_bfile.c
    trunk/blender/source/blender/editors/metaball/mball_edit.c
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_controller.c

Modified: trunk/blender/source/blender/blenlib/intern/BLI_bfile.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_bfile.c	2010-06-27 19:10:36 UTC (rev 29744)
+++ trunk/blender/source/blender/blenlib/intern/BLI_bfile.c	2010-06-27 21:03:39 UTC (rev 29745)
@@ -34,6 +34,7 @@
 #else
  #include <io.h>
  #include "BLI_winstuff.h"
+ static char* find_in_pathlist(char* filename, char* pathlist);
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -66,7 +67,6 @@
 static void chomp(char* line);
 static void expand_envvars(char* src, char* dst);
 static void fill_paths(BFILE *bfile, const char *path, const char *relpath);
-static char* find_in_pathlist(char* filename, char* pathlist);
 static void init_vars_from_file(const char* path);
 static void free_paths(BFILE* bfile);
 static void setup_temp();
@@ -481,6 +481,8 @@
 #else
  #define SEPARATOR ':'
 #endif
+
+#ifdef WIN32
 static char* find_in_pathlist(char* filename, char* pathlist) {
 	char first[FILE_MAX + 10];
 	char* rest = NULL;
@@ -510,8 +512,8 @@
 		return NULL;
 	}
 }
+#endif
 
-
 /**
  Setup fpath and tpath based in the needs of the bfile.
  */

Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c	2010-06-27 19:10:36 UTC (rev 29744)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c	2010-06-27 21:03:39 UTC (rev 29745)
@@ -47,6 +47,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_context.h"
+#include "BKE_library.h"
 
 #include "ED_screen.h"
 #include "ED_view3d.h"

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-06-27 19:10:36 UTC (rev 29744)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-06-27 21:03:39 UTC (rev 29745)
@@ -3184,8 +3184,8 @@
 	uiItemR(row, ptr, "name", 0, "", 0);
 
 	subrow= uiLayoutRow(row, 0);
-	uiLayoutSetActive(subrow, (RNA_boolean_get(logic_ptr, "sensors_show_active_states")
-							&& RNA_boolean_get(ptr, "expanded") || RNA_boolean_get(ptr, "pinned")));
+	uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "sensors_show_active_states")
+							&& RNA_boolean_get(ptr, "expanded")) || RNA_boolean_get(ptr, "pinned")));
 	uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0);
 
 	uiItemO(row, "", ICON_X, "LOGIC_OT_sensor_remove");
@@ -3602,8 +3602,8 @@
 	uiItemR(row, ptr, "name", 0, "", 0);
 
 	subrow= uiLayoutRow(row, 0);
-	uiLayoutSetActive(subrow, (RNA_boolean_get(logic_ptr, "actuators_show_active_states")
-							&& RNA_boolean_get(ptr, "expanded") || RNA_boolean_get(ptr, "pinned")));
+	uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "actuators_show_active_states")
+							&& RNA_boolean_get(ptr, "expanded")) || RNA_boolean_get(ptr, "pinned")));
 	uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0);
 
 	uiItemO(row, "", ICON_X, "LOGIC_OT_actuator_remove");
@@ -4436,7 +4436,7 @@
 		bController *cont;
 		PointerRNA ptr;
 		uiLayout *split, *subsplit, *col;
-		int iact;
+
 		
 		ob= (Object *)idar[a];
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_controller.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_controller.c	2010-06-27 19:10:36 UTC (rev 29744)
+++ trunk/blender/source/blender/makesrna/intern/rna_controller.c	2010-06-27 21:03:39 UTC (rev 29745)
@@ -113,6 +113,7 @@
 		values[i] = (cont->state_mask & (1<<i));
 }
 
+#if 0 /* editable is set to false, comment for now. */
 static void rna_Controller_state_set(PointerRNA *ptr, const int *values)
 {
 	bController *cont= (bController *)ptr->data;
@@ -135,6 +136,7 @@
 		else cont->state_mask &= ~(1<<i);
 	}
 }
+#endif
 
 #else
 





More information about the Bf-blender-cvs mailing list