diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
| commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
| tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /intern/cycles/subd/subd_mesh.cpp | |
| parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
| parent | de80e687689032cb85179a1f7e89750573631d5d (diff) | |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'intern/cycles/subd/subd_mesh.cpp')
| -rw-r--r-- | intern/cycles/subd/subd_mesh.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/subd/subd_mesh.cpp b/intern/cycles/subd/subd_mesh.cpp index 0db20656f39..17a730e5efe 100644 --- a/intern/cycles/subd/subd_mesh.cpp +++ b/intern/cycles/subd/subd_mesh.cpp @@ -109,8 +109,8 @@ public: evalctrl.EvalLimitSample<OsdCpuVertexBuffer,OsdCpuVertexBuffer>(coords, evalctx, 0); *P_ = make_float3(P[0], P[1], P[2]); - if (dPdu_) *dPdu_ = make_float3(dPdv[0], dPdv[1], dPdv[2]); - if (dPdv_) *dPdv_ = make_float3(dPdu[0], dPdu[1], dPdu[2]); + if(dPdu_) *dPdu_ = make_float3(dPdv[0], dPdv[1], dPdv[2]); + if(dPdv_) *dPdv_ = make_float3(dPdu[0], dPdu[1], dPdu[2]); /* optimize: skip evaluating derivatives when not needed */ /* todo: swapped derivatives, different winding convention? */ @@ -234,7 +234,7 @@ bool OpenSubdMesh::finish() void OpenSubdMesh::tessellate(DiagSplit *split) { - if (num_ptex_faces == 0) + if(num_ptex_faces == 0) return; const int level = 3; |