Revision: 56077
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56077
Author: psy-fi
Date: 2013-04-16 00:56:24 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Compile fixes for recent commits
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
trunk/blender/source/blender/blenkernel/intern/ocean.c
Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.cpp 2013-04-15
23:12:54 UTC (rev 56076)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.cpp 2013-04-16
00:56:24 UTC (rev 56077)
@@ -36,6 +36,7 @@
#include "kernel_projection.h"
#include "kernel_differential.h"
#include "kernel_object.h"
+#include "kernel_random.h"
#include "kernel_bvh.h"
#include "kernel_triangle.h"
#include "kernel_curve.h"
Modified: trunk/blender/source/blender/blenkernel/intern/ocean.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ocean.c 2013-04-15
23:12:54 UTC (rev 56076)
+++ trunk/blender/source/blender/blenkernel/intern/ocean.c 2013-04-16
00:56:24 UTC (rev 56077)
@@ -159,8 +159,8 @@
float length2;
do {
- x = (float) (nextfr(-1, 1));
- y = (float)(nextfr(-1, 1));
+ x = (float) (nextfr(rng, -1, 1));
+ y = (float)(nextfr(rng, -1, 1));
length2 = x * x + y * y;
} while (length2 >= 1 || length2 == 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
