Revision: 42414
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42414
Author: nazgul
Date: 2011-12-04 17:26:35 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Merging r42394 through r42412 form trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42394
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42412
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
branches/soc-2011-tomato/intern/cycles/util/util_math.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_background.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_value.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/
branches/soc-2011-tomato/source/blender/makesdna/DNA_defs.h
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42393
+ /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42412
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_add_closure.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_attribute.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_background.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_bump.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_emission.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_fresnel.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_geometry.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_holdout.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_hsv.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_image_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_light_path.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mapping.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_math.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mix.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_output_surface.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_output_volume.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_value.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_vector_math.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_hsv.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h 2011-12-04
17:24:34 UTC (rev 42413)
+++ branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h 2011-12-04
17:26:35 UTC (rev 42414)
@@ -19,12 +19,15 @@
#ifndef __UTIL_BOUNDBOX_H__
#define __UTIL_BOUNDBOX_H__
+#include <math.h>
#include <float.h>
-#include <cmath>
+#include "util_math.h"
#include "util_transform.h"
#include "util_types.h"
+using namespace std;
+
CCL_NAMESPACE_BEGIN
class BoundBox
@@ -73,8 +76,8 @@
bool valid(void) const
{
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
