[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42027] branches/soc-2011-onion-uv-tools/ source: *Compilation fixes

[Antony Riakiotakis]

Revision: 42027
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42027
Author:   psy-fi
Date:     2011-11-21 11:27:43 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
*Compilation fixes
*porting weight export camera setup to new paradigm.

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_resources.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_resources.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_resources.h	2011-11-21 10:20:35 UTC (rev 42026)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_resources.h	2011-11-21 11:27:43 UTC (rev 42027)
@@ -258,7 +258,7 @@
 	TH_PATH_BEFORE,
 	TH_PATH_AFTER,
 	TH_CAMERA_PATH,
-	TH_LOCK_MARKER
+	TH_LOCK_MARKER,
 
 	TH_STITCH_PREVIEW_FACE,
 	TH_STITCH_PREVIEW_EDGE,

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c	2011-11-21 10:20:35 UTC (rev 42026)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c	2011-11-21 11:27:43 UTC (rev 42027)
@@ -80,7 +80,8 @@
 #include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_report.h"
-#include "BKE_scene.h"#include "BKE_global.h"
+#include "BKE_scene.h"
+#include "BKE_global.h"
 #include "BKE_deform.h"
 
 #include "BIF_gl.h"

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c	2011-11-21 10:20:35 UTC (rev 42026)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c	2011-11-21 11:27:43 UTC (rev 42027)
@@ -64,7 +64,8 @@
 #include "BKE_screen.h"
 #include "BKE_unit.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_deform.h"#include "BKE_movieclip.h"
+#include "BKE_deform.h"
+#include "BKE_movieclip.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"	// make_stars
@@ -2952,15 +2953,19 @@
 
 	/* change camera matrix if object camera */
 	if(rv3d->persp==RV3D_CAMOB && v3d->camera) {
-		float winmat[4][4];
-		float _clipsta, _clipend, _lens, _yco, _dx, _dy, _sensor_x= DEFAULT_SENSOR_WIDTH, _sensor_y= DEFAULT_SENSOR_HEIGHT;
-		short _sensor_fit= CAMERA_SENSOR_FIT_AUTO;
-		rctf _viewplane;
+		CameraParams params;
 
-		object_camera_matrix(&scene->r, v3d->camera, w, h, 0, winmat, &_viewplane, &_clipsta, &_clipend, &_lens,
-				&_sensor_x, &_sensor_y, &_sensor_fit, &_yco, &_dx, &_dy);
+		camera_params_init(&params);
+		camera_params_from_object(&params, v3d->camera);
+		camera_params_compute_viewplane(&params, w, h, scene->r.xasp, scene->r.yasp);
+		camera_params_compute_matrix(&params);
+
+		view3d_main_area_setup_view(scene, v3d, ar, NULL, winmat);
+	} else {
+		view3d_main_area_setup_view(scene, v3d, ar, NULL, NULL);
 	}
 
+
 	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxsize);
 	if(w > maxsize) w= maxsize;
 	if(h > maxsize) h= maxsize;

Modified: branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-11-21 10:20:35 UTC (rev 42026)
+++ branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-11-21 11:27:43 UTC (rev 42027)
@@ -200,8 +200,9 @@
 int ED_space_image_show_render(struct SpaceImage *sima){return 0;}
 int ED_space_image_show_paint(struct SpaceImage *sima){return 0;}
 void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings *settings){}
+void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){}
+struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;}
 void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct ToolSettings *settings){}
-struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;}
 
 void ED_screen_set_scene(struct bContext *C, struct Scene *scene){}
 void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip){}