diff options
| -rw-r--r-- | source/blender/blenlib/intern/BLI_bfile.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 10 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_controller.c | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/BLI_bfile.c b/source/blender/blenlib/intern/BLI_bfile.c index dc593e23bdc..2330beb618d 100644 --- a/source/blender/blenlib/intern/BLI_bfile.c +++ b/source/blender/blenlib/intern/BLI_bfile.c @@ -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. diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 2ffccff835d..69735d7b041 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -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" diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 409277cb66e..26b4b6fc08c 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -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]; diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index d9523344414..275a34e3bbb 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -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 |