[Bf-blender-cvs] [dbe5efc] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

[Sergey Sharybin]

Commit: dbe5efc79b276016b67435078a817fb6051bdeb2
Author: Sergey Sharybin
Date:   Mon Dec 29 17:35:00 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBdbe5efc79b276016b67435078a817fb6051bdeb2

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc intern/cycles/blender/blender_python.cpp
index 1cd8fdb,5a9895a8..77c2346
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@@ -11,10 -11,9 +11,10 @@@
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
-  * limitations under the License
+  * limitations under the License.
   */
  
 +#include <cmath>
  #include <Python.h>
  
  #include "CCL_api.h"