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/iksolver/extern | |
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/iksolver/extern')
-rw-r--r-- | intern/iksolver/extern/IK_solver.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/iksolver/extern/IK_solver.h b/intern/iksolver/extern/IK_solver.h index 4de9f143e77..55223806d5c 100644 --- a/intern/iksolver/extern/IK_solver.h +++ b/intern/iksolver/extern/IK_solver.h @@ -35,10 +35,10 @@ * Copyright (C) 2001 NaN Technologies B.V. * - * @author Laurence, Brecht - * @mainpage IK - Blender inverse kinematics module. + * \author Laurence, Brecht + * \page IK - Blender inverse kinematics module. * - * @section about About the IK module + * \section about About the IK module * * This module allows you to create segments and form them into * tree. You can then define a goal points that the end of a given @@ -47,7 +47,7 @@ * to get the as near as possible to the goal. This solver uses an * inverse jacobian method to find a solution. * - * @section issues Known issues with this IK solver. + * \section issues Known issues with this IK solver. * * - There is currently no support for joint constraints in the * solver. This is within the realms of possibility - please ask @@ -60,7 +60,7 @@ * Other algorithms exist which are more suitable for real-time * applications, please ask if this functionality is required. * - * @section dependencies Dependencies + * \section dependencies Dependencies * * This module only depends on Moto. */ |