diff options
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index d2b9e6caf96..7d06bbce43d 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -96,7 +96,6 @@ int isect_ray_tri_epsilon_v3(float p1[3], float d[3], float v0[3], float v1[3], float v2[3], float *lambda, float *uv, float epsilon); /* point in polygon */ -int isect_point_tri_v2(float p[2], float a[2], float b[2], float c[2]); int isect_point_quad_v2(float p[2], float a[2], float b[2], float c[2], float d[2]); int isect_point_tri_v2(float v1[2], float v2[2], float v3[2], float pt[2]); @@ -165,8 +164,8 @@ void map_to_sphere(float *u, float *v, float x, float y, float z); /********************************* Tangents **********************************/ typedef struct VertexTangent { - float tang[3], uv[2]; struct VertexTangent *next; + float tang[3], uv[2]; } VertexTangent; float *find_vertex_tangent(VertexTangent *vtang, float *uv); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 8400bdbeef5..9be0690d95a 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -79,6 +79,8 @@ /* local */ #define UNIQUE_NAME_MAX 128 +extern char bprogname[]; + static int add_win32_extension(char *name); static char *blender_version_decimal(void); @@ -894,7 +896,6 @@ static int test_env_path(char *path, const char *envvar) static int get_path_local(char *targetpath, const char *folder_name, const char *subfolder_name) { - extern char bprogname[]; /* argv[0] from creator.c */ char bprogdir[FILE_MAX]; char relfolder[FILE_MAX]; @@ -963,7 +964,6 @@ static int get_path_system(char *targetpath, const char *folder_name, const char /* first allow developer only overrides to the system path * these are only used when running blender from source */ - extern char bprogname[]; /* argv[0] from creator.c */ char cwd[FILE_MAX]; char relfolder[FILE_MAX]; char bprogdir[FILE_MAX]; @@ -1778,7 +1778,6 @@ void BLI_where_is_temp(char *fullname, int usertemp) } char *get_install_dir(void) { - extern char bprogname[]; char *tmpname = BLI_strdup(bprogname); char *cut; |