[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33468] trunk/blender/source/blender: Maintenance,
Campbell Barton
ideasman42 at gmail.com
Sat Dec 4 14:00:28 CET 2010
Revision: 33468
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33468
Author: campbellbarton
Date: 2010-12-04 14:00:28 +0100 (Sat, 04 Dec 2010)
Log Message:
-----------
Maintenance,
- remove some redundant declarations
- changed VertexTangent and Path structs to avoid compiler alignment padding.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_ipo.h
trunk/blender/source/blender/blenkernel/BKE_mball.h
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenlib/BLI_math_geom.h
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/armature/armature_intern.h
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/meshlaplacian.h
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/include/ED_uvedit.h
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/screen/screen_context.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h
trunk/blender/source/blender/editors/space_text/text_intern.h
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/imbuf/intern/IMB_allocimbuf.h
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/modifiers/intern/MOD_util.h
trunk/blender/source/blender/python/BPY_extern.h
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/blenkernel/BKE_ipo.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_ipo.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenkernel/BKE_ipo.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -44,10 +44,6 @@
void free_ipo(struct Ipo *ipo);
-// xxx perhaps this should be in curve api not in anim api
-void correct_bezpart(float *v1, float *v2, float *v3, float *v4);
-
-
#ifdef __cplusplus
};
#endif
Modified: trunk/blender/source/blender/blenkernel/BKE_mball.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mball.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenkernel/BKE_mball.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -127,12 +127,7 @@
char *data;
};
-void calc_mballco(struct MetaElem *ml, float *vec);
-float densfunc(struct MetaElem *ball, float x, float y, float z);
octal_node* find_metaball_octal_node(octal_node *node, float x, float y, float z, short depth);
-float metaball(float x, float y, float z);
-void accum_mballfaces(int i1, int i2, int i3, int i4);
-void *new_pgn_element(int size);
void freepolygonize(PROCESS *p);
void docube(CUBE *cube, PROCESS *p, struct MetaBall *mb);
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -399,7 +399,6 @@
void ntreeCompositTagGenerators(struct bNodeTree *ntree);
void ntreeCompositForceHidden(struct bNodeTree *ntree, struct Scene *scene);
-void free_compbuf(struct CompBuf *cbuf); /* internal...*/
/* ************** TEXTURE NODES *************** */
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -90,6 +90,7 @@
struct Object *copy_object(struct Object *ob);
void expand_local_object(struct Object *ob);
void make_local_object(struct Object *ob);
+int object_is_libdata(struct Object *ob);
int object_data_is_libdata(struct Object *ob);
void set_mblur_offs(float blur);
void set_field_offs(float field);
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-12-04 13:00:28 UTC (rev 33468)
@@ -43,7 +43,7 @@
#include "BKE_colortools.h"
#include "BKE_curve.h"
-#include "BKE_ipo.h"
+#include "BKE_fcurve.h"
#include "BKE_utildefines.h"
#include "BLI_blenlib.h"
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2010-12-04 13:00:28 UTC (rev 33468)
@@ -1972,7 +1972,6 @@
/* copy stack compbufs to sockets */
static void composit_end_exec(bNodeTree *ntree, int is_group)
{
- extern void print_compbuf(char *str, struct CompBuf *cbuf);
bNode *node;
bNodeStack *ns;
int a;
Modified: trunk/blender/source/blender/blenlib/BLI_math_geom.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_geom.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenlib/BLI_math_geom.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -96,7 +96,6 @@
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 @@
/********************************* 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);
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2010-12-04 13:00:28 UTC (rev 33468)
@@ -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 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 @@
/* 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 @@
}
char *get_install_dir(void) {
- extern char bprogname[];
char *tmpname = BLI_strdup(bprogname);
char *cut;
Modified: trunk/blender/source/blender/editors/armature/armature_intern.h
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_intern.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/editors/armature/armature_intern.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -104,7 +104,6 @@
void POSE_OT_group_add(struct wmOperatorType *ot);
void POSE_OT_group_remove(struct wmOperatorType *ot);
-void POSE_OT_group_remove(struct wmOperatorType *ot);
void POSE_OT_group_assign(struct wmOperatorType *ot);
void POSE_OT_group_unassign(struct wmOperatorType *ot);
void POSE_OT_group_select(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2010-12-04 13:00:28 UTC (rev 33468)
@@ -105,10 +105,6 @@
void initStrokeIterator(BArcIterator *iter, SK_Stroke *stk, int start, int end);
-void sk_deleteSelectedStrokes(SK_Sketch *sketch);
-
-SK_Point *sk_lastStrokePoint(SK_Stroke *stk);
-
int sk_detectCutGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
void sk_applyCutGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
int sk_detectTrimGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.h
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -78,9 +78,7 @@
/* Harmonic Coordinates */
-void mesh_deform_bind(struct Scene *scene,
- struct MeshDeformModifierData *mmd,
- float *vertexcos, int totvert, float cagemat[][4]);
+/* mesh_deform_bind(...) defined in ED_armature.h */
#endif
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -98,10 +98,6 @@
/* editmesh.c */
-
-void ED_spacetypes_init(void);
-void ED_keymap_mesh(struct wmKeyConfig *keyconf);
-
void make_editMesh(struct Scene *scene, struct Object *ob);
void load_editMesh(struct Scene *scene, struct Object *ob);
void remake_editMesh(struct Scene *scene, struct Object *ob);
Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/editors/include/ED_object.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -104,9 +104,6 @@
void ED_object_single_users(struct Main *bmain, struct Scene *scene, int full);
-/* cleanup */
-int object_is_libdata(struct Object *ob);
-int object_data_is_libdata(struct Object *ob);
/* object motion paths */
void ED_objects_clear_paths(struct bContext *C);
Modified: trunk/blender/source/blender/editors/include/ED_uvedit.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_uvedit.h 2010-12-04 12:33:45 UTC (rev 33467)
+++ trunk/blender/source/blender/editors/include/ED_uvedit.h 2010-12-04 13:00:28 UTC (rev 33468)
@@ -46,11 +46,20 @@
int ED_uvedit_test_silent(struct Object *obedit);
int ED_uvedit_test(struct Object *obedit);
+/* visibility and selection */
+int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
+int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
+int uvedit_face_visible_nolocal(struct Scene *scene, struct EditFace *efa);
int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf);
-int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
-int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
int uvedit_uv_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
+void uvedit_edge_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
+void uvedit_edge_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list