[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61072] branches/soc-2013-sketch_mesh/ source/blender: branch now compiles on linux (minor fixes)

[Campbell Barton]

Revision: 61072
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61072
Author:   campbellbarton
Date:     2013-11-03 16:02:33 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
branch now compiles on linux (minor fixes)

Modified Paths:
--------------
    branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_deform_laplacian.c
    branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_laplaciandeform.c

Modified: branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_deform_laplacian.c
===================================================================
--- branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_deform_laplacian.c	2013-11-03 14:25:37 UTC (rev 61071)
+++ branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_deform_laplacian.c	2013-11-03 16:02:33 UTC (rev 61072)
@@ -117,8 +117,6 @@
 	LAP_MODAL_NOTHING 
 };
 
-wmKeyMap * laplacian_deform_modal_keymap(wmKeyConfig *keyconf);
-void MESH_OT_vertices_laplacian_deform(wmOperatorType *ot);
 static StaticAnchors * init_static_anchors(int numv, int nums);
 static HandlerAnchors * init_handler_anchors(int numh);
 static LaplacianSystem * init_laplacian_system(int numv, int nums, int numh);
@@ -136,7 +134,6 @@
 static void laplacian_deform_mark_static(bContext *C, wmOperator *op);
 static void laplacian_deform_mark_handlers(bContext *C, wmOperator *op);
 static void laplacian_deform_preview(bContext *C, wmOperator *op);
-static void laplacian_deform_init(struct bContext *C, LaplacianSystem * sys);
 static void rotate_differential_coordinates(SystemCustomData * data);
 static void update_system_state(SystemCustomData * data, int state);
 
@@ -266,7 +263,7 @@
 
 }
 
-static int laplacian_deform_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *evt)
+static int laplacian_deform_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
 	SystemCustomData * sys;
 	Object *obedit = CTX_data_edit_object(C);
@@ -329,12 +326,14 @@
 	laplacian_deform_mark_handlers(C, op);
 }
 
-static copy_m4_v16(float mout[4][4], double vin[16])
+static void copy_m4_v16(float mout[4][4], double vin[16])
 {
 	int i, j;
-	for (i=0; i<4; i++)
-		for (j=0; j<4; j++)
-			mout[i][j] = (float)vin[i*4 + j];
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 4; j++) {
+			mout[i][j] = (float)vin[i * 4 + j];
+		}
+	}
 }
 
 static void laplacian_deform_mark_handlers(bContext *C, wmOperator *op)
@@ -712,11 +711,9 @@
 
 }
 
-static int laplacian_deform_cancel(bContext *C, wmOperator *op)
+static int laplacian_deform_cancel(bContext *UNUSED(C), wmOperator *op)
 {
 	SystemCustomData * data;
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	data = op->customdata;
 	if (data) {
 		delete_laplacian_system(data->sys);
@@ -989,4 +986,4 @@
 		update_system_state(data, LAP_STATE_HAS_L_COMPUTE);
 
 	}
-}
\ No newline at end of file
+}

Modified: branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_draw.c	2013-11-03 14:25:37 UTC (rev 61071)
+++ branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_draw.c	2013-11-03 16:02:33 UTC (rev 61072)
@@ -965,6 +965,8 @@
 						UI_icon_draw(x, y, ICON_MOD_TRIANGULATE); break;
 					case eModifierType_MeshCache:
 						UI_icon_draw(x, y, ICON_MOD_MESHDEFORM); break;  /* XXX, needs own icon */
+					case eModifierType_LaplacianDeform:
+						UI_icon_draw(x, y, ICON_MOD_MESHDEFORM); break;  /* XXX, needs own icon */
 					/* Default */
 					case eModifierType_None:
 					case eModifierType_ShapeKey:

Modified: branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_laplaciandeform.c
===================================================================
--- branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_laplaciandeform.c	2013-11-03 14:25:37 UTC (rev 61071)
+++ branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_laplaciandeform.c	2013-11-03 16:02:33 UTC (rev 61072)
@@ -35,7 +35,7 @@
 #include "BLI_string.h"
 #include "BLI_array.h"
 #include "MEM_guardedalloc.h"
-#include "BKE_Mesh.h"
+#include "BKE_mesh.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_particle.h"
 #include "BKE_deform.h"