bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

remove some warnings

Browse Source
This commit is contained in:
Campbell Barton 2010-06-27 21:03:39 +00:00
parent 1a59eb21a9
commit d9bcd249cf
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/BLI_bfile.c
View File

@ -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 @@ static void expand_envvars(char* src, char* dst) {
#else
#define SEPARATOR ':'
#endif
#ifdef WIN32
static char* find_in_pathlist(char* filename, char* pathlist) {
char first[FILE_MAX + 10];
char* rest = NULL;
@ -510,7 +512,7 @@ static char* find_in_pathlist(char* filename, char* pathlist) {
return NULL;
}
}
#endif
/**
Setup fpath and tpath based in the needs of the bfile.

1
source/blender/editors/metaball/mball_edit.c
View File

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

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

@ -3184,8 +3184,8 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo
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 @@ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *
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 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
bController *cont;
PointerRNA ptr;
uiLayout *split, *subsplit, *col;
int iact;
ob= (Object *)idar[a];

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

@ -113,6 +113,7 @@ static void rna_Controller_state_get(PointerRNA *ptr, int *values)
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 @@ static void rna_Controller_state_set(PointerRNA *ptr, const int *values)
else cont->state_mask &= ~(1<<i);
}
}
#endif
#else