[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23803] trunk/blender: fix for warnings, wkey menu wasnt registered

[Campbell Barton]

Revision: 23803
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23803
Author:   campbellbarton
Date:     2009-10-13 09:39:08 +0200 (Tue, 13 Oct 2009)

Log Message:
-----------
fix for warnings, wkey menu wasnt registered

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/armature/editarmature_sketch.c
    trunk/blender/source/blender/editors/include/ED_mesh.h
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2009-10-13 06:15:41 UTC (rev 23802)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2009-10-13 07:39:08 UTC (rev 23803)
@@ -1423,6 +1423,7 @@
 bpy.types.register(VIEW3D_MT_snap) # Edit Menus
 
 bpy.types.register(VIEW3D_MT_edit_mesh)
+bpy.types.register(VIEW3D_MT_edit_mesh_specials) # Only as a menu for keybindings
 bpy.types.register(VIEW3D_MT_edit_mesh_vertices)
 bpy.types.register(VIEW3D_MT_edit_mesh_edges)
 bpy.types.register(VIEW3D_MT_edit_mesh_faces)

Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c	2009-10-13 06:15:41 UTC (rev 23802)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c	2009-10-13 07:39:08 UTC (rev 23803)
@@ -1006,9 +1006,9 @@
 	{
 		float ray_start[3], ray_normal[3];
 		float delta = VecLenf(stk->points[i].p, stk->points[i + 1].p);
-		short pval[2];
+		float pval[2];
 
-		project_short_noclip(ar, stk->points[i].p, pval);
+		project_float(ar, stk->points[i].p, pval);
 		viewray(ar, v3d, pval, ray_start, ray_normal);
 
 		VecMulf(ray_normal, distance * progress / length);
@@ -1076,10 +1076,13 @@
 		float dist = FLT_MAX;
 		float p[3];
 		float size = 0;
+		float mvalf[2];
 
 		BLI_freelistN(&sketch->depth_peels);
 		sketch->depth_peels.first = sketch->depth_peels.last = NULL;
 
+		mvalf[0]= dd->mval[0];
+		mvalf[1]= dd->mval[1];
 		peelObjectsContext(C, &sketch->depth_peels, dd->mval);
 
 		if (stk->nb_points > 0 && stk->points[stk->nb_points - 1].type == PT_CONTINUOUS)
@@ -1712,7 +1715,7 @@
 				{
 					SK_Intersection *isect = MEM_callocN(sizeof(SK_Intersection), "Intersection");
 					float ray_start[3], ray_end[3];
-					short mval[2];
+					float mval[2];
 
 					isect->gesture_index = g_i;
 					isect->before = s_i;
@@ -1720,8 +1723,8 @@
 					isect->stroke = stk;
 					isect->lambda = lambda;
 
-					mval[0] = (short)(vi[0]);
-					mval[1] = (short)(vi[1]);
+					mval[0] = vi[0];
+					mval[1] = vi[1];
 					viewline(ar, v3d, mval, ray_start, ray_end);
 
 					LineIntersectLine(	stk->points[s_i].p,

Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h	2009-10-13 06:15:41 UTC (rev 23802)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h	2009-10-13 07:39:08 UTC (rev 23803)
@@ -160,6 +160,8 @@
 void		EM_select_by_material(struct EditMesh *em, int index);
 void		EM_deselect_by_material(struct EditMesh *em, int index); 
 
+void		EM_automerge(struct Scene *scene, struct Object *obedit, int update);
+
 /* editface.c */
 struct MTFace	*EM_get_active_mtface(struct EditMesh *em, struct EditFace **act_efa, struct MCol **mcol, int sloppy);
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2009-10-13 06:15:41 UTC (rev 23802)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2009-10-13 07:39:08 UTC (rev 23803)
@@ -1469,12 +1469,15 @@
 {
 	StrokeCache *cache = ss->cache;
 	Brush *brush = paint_brush(&sd->paint);
-	float *buffer;
+	float *buffer= NULL;
 	int i;
 
 	/* Restore the mesh before continuing with anchored stroke */
 	if((brush->flag & BRUSH_ANCHORED) && ss->mesh_co_orig) {
-		buffer = buffer = ss->drawobject!=0?(float *)GPU_buffer_lock( ss->drawobject->normals ):0;
+
+		if(ss->drawobject)
+			buffer= (float *)GPU_buffer_lock(ss->drawobject->normals);
+
 		for(i = 0; i < ss->totvert; ++i) {
 			VecCopyf(ss->mvert[i].co, ss->mesh_co_orig[i]);
 			ss->mvert[i].no[0] = cache->orig_norms[i][0];

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2009-10-13 06:15:41 UTC (rev 23802)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2009-10-13 07:39:08 UTC (rev 23803)
@@ -59,6 +59,7 @@
 //#include "BIF_screen.h"
 //#include "BIF_mywindow.h"
 #include "BIF_gl.h"
+#include "BIF_glutil.h"
 //#include "BIF_editmesh.h"
 //#include "BIF_editsima.h"
 //#include "BIF_editparticle.h"