[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27522] branches/render25/source/blender: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r27511:27521

[Brecht Van Lommel]

Revision: 27522
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27522
Author:   blendix
Date:     2010-03-15 21:23:06 +0100 (Mon, 15 Mar 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27511:27521

Modified Paths:
--------------
    branches/render25/source/blender/editors/transform/transform.c
    branches/render25/source/blender/python/intern/bpy_driver.c
    branches/render25/source/blender/python/intern/bpy_interface.c
    branches/render25/source/blender/render/intern/source/object_displace.c
    branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: branches/render25/source/blender/editors/transform/transform.c
===================================================================
--- branches/render25/source/blender/editors/transform/transform.c	2010-03-15 20:22:05 UTC (rev 27521)
+++ branches/render25/source/blender/editors/transform/transform.c	2010-03-15 20:23:06 UTC (rev 27522)
@@ -1503,6 +1503,7 @@
 	}
 
 	/* Stupid code to have Ctrl-Click on manipulator work ok */
+	if(event)
 	{
 		wmKeyMap *keymap = WM_keymap_active(CTX_wm_manager(C), op->type->modalkeymap);
 		wmKeyMapItem *kmi;

Modified: branches/render25/source/blender/python/intern/bpy_driver.c
===================================================================
--- branches/render25/source/blender/python/intern/bpy_driver.c	2010-03-15 20:22:05 UTC (rev 27521)
+++ branches/render25/source/blender/python/intern/bpy_driver.c	2010-03-15 20:23:06 UTC (rev 27522)
@@ -27,6 +27,7 @@
 #include "DNA_anim_types.h"
 
 #include "BLI_listbase.h"
+#include "BLI_math_base.h"
 
 #include "BKE_fcurve.h"
 #include "BKE_global.h"

Modified: branches/render25/source/blender/python/intern/bpy_interface.c
===================================================================
--- branches/render25/source/blender/python/intern/bpy_interface.c	2010-03-15 20:22:05 UTC (rev 27521)
+++ branches/render25/source/blender/python/intern/bpy_interface.c	2010-03-15 20:23:06 UTC (rev 27522)
@@ -40,6 +40,7 @@
 
 #include "MEM_guardedalloc.h"
 #include "BLI_path_util.h"
+#include "BLI_math_base.h"
 
 #include "BKE_context.h"
 #include "BKE_text.h"

Modified: branches/render25/source/blender/render/intern/source/object_displace.c
===================================================================
--- branches/render25/source/blender/render/intern/source/object_displace.c	2010-03-15 20:22:05 UTC (rev 27521)
+++ branches/render25/source/blender/render/intern/source/object_displace.c	2010-03-15 20:23:06 UTC (rev 27522)
@@ -58,6 +58,26 @@
 	return 0;
 }
 
+static void displace_derivatives(ShadeInput *shi)
+{
+	ShadeGeometry *geom= &shi->geometry;
+	ShadePrimitive*prim= &shi->primitive;
+	float dcodu[3], dcodv[3];
+
+	/* compute dudx/dvdx */
+	sub_v3_v3v3(dcodu, prim->v3->co, prim->v2->co);
+	sub_v3_v3v3(dcodv, prim->v3->co, prim->v1->co);
+	
+	mul_v3_fl(dcodu, 1.0f/dot_v3v3(dcodu, dcodu));
+	mul_v3_fl(dcodv, 1.0f/dot_v3v3(dcodv, dcodv));
+	
+	geom->dx_u= dot_v3v3(geom->dxco, dcodu);
+	geom->dx_v= dot_v3v3(geom->dxco, dcodv);
+	
+	geom->dy_u= dot_v3v3(geom->dyco, dcodu);
+	geom->dy_v= dot_v3v3(geom->dyco, dcodv);
+}
+
 static void displace_render_vert(Render *re, ObjectRen *obr, ShadeInput *shi, VertRen *vr, int vindex, float *scale, float mat[][4], float nmat[][3], float *sample)
 {
 	MTFace *tface;

Modified: branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-03-15 20:22:05 UTC (rev 27521)
+++ branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-03-15 20:23:06 UTC (rev 27522)
@@ -189,6 +189,7 @@
 void WM_cursor_wait (int val) {}
 void ED_node_texture_default(struct Tex *tx){}
 void ED_node_changed_update(struct bContext *C, struct bNode *node){}
+void ED_node_generic_update(struct Main *bmain, struct Scene *scene, struct bNodeTree *ntree, struct bNode *node){}
 void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene){}
 int ED_view3d_scene_layer_set(int lay, const int *values){return 0;}
 void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar){}