[Bf-blender-cvs] [9b93deb] temp-cycles-microdisplacement: Add a few changes from master that got missed

[Mai Lavelle]

Commit: 9b93deb61493cb7f1cb8c06cea6dc3d1d3ddc434
Author: Mai Lavelle
Date:   Sat Apr 16 14:51:19 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB9b93deb61493cb7f1cb8c06cea6dc3d1d3ddc434

Add a few changes from master that got missed

===================================================================

M	intern/cycles/blender/blender_mesh.cpp
M	intern/cycles/render/camera.cpp
M	intern/cycles/subd/subd_patch.cpp
M	intern/cycles/subd/subd_split.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 8a9aa54..24e6ba8 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -844,7 +844,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
 			if(render_layer.use_surfaces && !hide_tris) {
 				mesh->displacement_scale = RNA_float_get(&cmesh, "displacement_scale");
 
-				if(cmesh.data && is_cpu && experimental && RNA_enum_get(&cmesh, "subdivision_type") != 0 &&
+				if(cmesh.data && is_cpu && experimental && RNA_enum_get(&cmesh, "subdivision_type") &&
 						(!preview || RNA_boolean_get(&cmesh, "preview_displacement")))
 				{
 					create_subd_mesh(scene, mesh, b_ob, b_mesh, &cmesh, used_shaders, preview);
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index 095faf4..028916c 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -83,8 +83,8 @@ Camera::Camera()
 	nearclip = 1e-5f;
 	farclip = 1e5f;
 
-	width = 0;
-	height = 0;
+	width = 1024;
+	height = 512;
 	resolution = 1;
 
 	viewplane.left = -((float)width/(float)height);
diff --git a/intern/cycles/subd/subd_patch.cpp b/intern/cycles/subd/subd_patch.cpp
index e75f88a..3b0fb5b 100644
--- a/intern/cycles/subd/subd_patch.cpp
+++ b/intern/cycles/subd/subd_patch.cpp
@@ -114,9 +114,20 @@ BoundBox LinearTrianglePatch::bound()
 
 void BicubicPatch::eval(float3 *P, float3 *dPdu, float3 *dPdv, float3 *N, float u, float v)
 {
-	decasteljau_bicubic(P, dPdu, dPdv, hull, u, v);
+	if (N) {
+		float3 dPdu_, dPdv_;
+		decasteljau_bicubic(P, &dPdu_, &dPdv_, hull, u, v);
 
-	assert(N == NULL);
+		if (dPdu && dPdv) {
+			*dPdu = dPdu_;
+			*dPdv = dPdv_;
+		}
+
+		*N = normalize(cross(dPdu_, dPdv_));
+	}
+	else {
+		decasteljau_bicubic(P, dPdu, dPdv, hull, u, v);
+	}
 }
 
 BoundBox BicubicPatch::bound()
diff --git a/intern/cycles/subd/subd_split.cpp b/intern/cycles/subd/subd_split.cpp
index 429eacb..5e2fb05 100644
--- a/intern/cycles/subd/subd_split.cpp
+++ b/intern/cycles/subd/subd_split.cpp
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "camera.h"
 #include "mesh.h"