[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10784] trunk/blender/source/blender/src: drawmesh. c - change from mal_CanDo that makes lighting work the same as in blender 2 .44.
Campbell Barton
cbarton at metavr.com
Sat May 26 19:52:35 CEST 2007
Revision: 10784
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bforge-svn&revision=10784
Author: campbellbarton
Date: 2007-05-26 19:52:35 +0200 (Sat, 26 May 2007)
Log Message:
-----------
drawmesh.c - change from mal_CanDo that makes lighting work the same as in blender 2.44.
header_view3d.c - smoothview wasnt working with the camera menu
Modified Paths:
--------------
trunk/blender/source/blender/src/drawmesh.c
trunk/blender/source/blender/src/header_view3d.c
Modified: trunk/blender/source/blender/src/drawmesh.c
===================================================================
--- trunk/blender/source/blender/src/drawmesh.c 2007-05-26 12:58:46 UTC (rev 10783)
+++ trunk/blender/source/blender/src/drawmesh.c 2007-05-26 17:52:35 UTC (rev 10784)
@@ -1034,7 +1034,7 @@
g_draw_tface_mesh_ob = ob;
g_draw_tface_mesh_istex = istex;
memcpy(g_draw_tface_mesh_obcol, obcol, sizeof(obcol));
- set_draw_settings_cached(1, 0, 0, 1, 0, 0, 0);
+ set_draw_settings_cached(1, 0, 0, g_draw_tface_mesh_islight, 0, 0, 0);
if(dt > OB_SOLID || g_draw_tface_mesh_islight==-1) {
bProperty *prop = get_property(ob, "Text");
Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c 2007-05-26 12:58:46 UTC (rev 10783)
+++ trunk/blender/source/blender/src/header_view3d.c 2007-05-26 17:52:35 UTC (rev 10784)
@@ -59,6 +59,7 @@
#include "DNA_view3d_types.h"
#include "DNA_text_types.h" /* for space handlers */
#include "DNA_texture_types.h"
+#include "DNA_userdef_types.h" /* U.smooth_viewtx */
#include "BKE_action.h"
#include "BKE_curve.h"
@@ -70,6 +71,7 @@
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_mesh.h"
+#include "BKE_utildefines.h" /* for VECCOPY */
#ifdef WITH_VERSE
#include "BKE_verse.h"
@@ -213,11 +215,35 @@
i++;
if (event==i) {
- G.vd->camera= base->object;
- handle_view3d_lock();
- G.vd->persp= 2;
- G.vd->view= 0;
+ if (G.vd->camera == base->object && G.vd->persp==2)
+ return;
+
+ if (U.smooth_viewtx) {
+ /* move 3d view to camera view */
+ float orig_ofs[3], orig_lens = G.vd->lens;
+ VECCOPY(orig_ofs, G.vd->ofs);
+
+ if (G.vd->camera && G.vd->persp==2)
+ view_settings_from_ob(G.vd->camera, G.vd->ofs, G.vd->viewquat, &G.vd->dist, &G.vd->lens);
+
+ G.vd->camera = base->object;
+ handle_view3d_lock();
+ G.vd->persp= 2;
+ G.vd->view= 0;
+
+ smooth_view_to_camera(G.vd);
+
+ /* restore values */
+ VECCOPY(G.vd->ofs, orig_ofs);
+ G.vd->lens = orig_lens;
+ } else {
+ G.vd->camera= base->object;
+ handle_view3d_lock();
+ G.vd->persp= 2;
+ G.vd->view= 0;
+ }
+ break;
}
}
}
More information about the Bf-blender-cvs
mailing list