svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00
parent 4c66e696fb 61596d5bb3
commit 48006292d8
717 changed files with 4737 additions and 3105 deletions
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -29,8 +29,8 @@
 *  \ingroup render
 */

-#ifndef RE_ENGINE_H
-#define RE_ENGINE_H
+#ifndef __RE_ENGINE_H__
+#define __RE_ENGINE_H__

 #include "DNA_listBase.h"
 #include "RNA_types.h"
@@ -116,5 +116,5 @@ void RE_engines_exit(void);

 RenderEngineType *RE_engines_find(const char *idname);

-#endif /* RE_ENGINE_H */
+#endif /* __RE_ENGINE_H__ */

--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -29,8 +29,8 @@
 *  \ingroup render
 */

-#ifndef RE_PIPELINE_H
-#define RE_PIPELINE_H
+#ifndef __RE_PIPELINE_H__
+#define __RE_PIPELINE_H__

 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
@@ -272,5 +272,5 @@ struct Scene *RE_GetScene(struct Render *re);

 int RE_is_rendering_allowed(struct Scene *scene, struct Object *camera_override, struct ReportList *reports);

-#endif /* RE_PIPELINE_H */
+#endif /* __RE_PIPELINE_H__ */

--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -29,8 +29,8 @@
 */


-#ifndef RE_RENDER_EXT_H
-#define RE_RENDER_EXT_H
+#ifndef __RE_RENDER_EXT_H__
+#define __RE_RENDER_EXT_H__

 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is for non-render pipeline exports (still old cruft here) */
@@ -70,5 +70,5 @@ void RE_free_sample_material(struct Material *mat);
 void RE_sample_material_color(struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3],
 						   int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob);

-#endif /* RE_RENDER_EXT_H */
+#endif /* __RE_RENDER_EXT_H__ */

--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -29,8 +29,8 @@
 */


-#ifndef RE_SHADER_EXT_H
-#define RE_SHADER_EXT_H
+#ifndef __RE_SHADER_EXT_H__
+#define __RE_SHADER_EXT_H__

 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is for shading and texture exports            */
@@ -214,4 +214,4 @@ void RE_bake_ibuf_filter(struct ImBuf *ibuf, char *mask, const int filter);
 #define BAKE_RESULT_NO_OBJECTS		1
 #define BAKE_RESULT_FEEDBACK_LOOP	2

-#endif /* RE_SHADER_EXT_H */
+#endif /* __RE_SHADER_EXT_H__ */
--- a/source/blender/render/intern/include/envmap.h
+++ b/source/blender/render/intern/include/envmap.h
@@ -33,8 +33,8 @@
 */


-#ifndef ENVMAP_EXT_H
-#define ENVMAP_EXT_H 
+#ifndef __ENVMAP_H__
+#define __ENVMAP_H__ 

 /**
 * Make environment maps for all objects in the scene that have an
@@ -48,5 +48,5 @@ struct TexResult;
 void make_envmaps(struct Render *re);
 int envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres);

-#endif /* ENVMAP_EXT_H */
+#endif /* __ENVMAP_H__ */

--- a/source/blender/render/intern/include/gammaCorrectionTables.h
+++ b/source/blender/render/intern/include/gammaCorrectionTables.h
@@ -33,8 +33,8 @@
 */


-#ifndef GAMMACORRECTIONTABLES_H
-#define GAMMACORRECTIONTABLES_H
+#ifndef __GAMMACORRECTIONTABLES_H__
+#define __GAMMACORRECTIONTABLES_H__

 /**
 * Initialise the gamma lookup tables
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -33,8 +33,8 @@
 */


-#ifndef INITRENDER_H
-#define INITRENDER_H 
+#ifndef __INITRENDER_H__
+#define __INITRENDER_H__ 

 struct Object;

@@ -49,5 +49,5 @@ void initparts(Render *re);
 void freeparts(Render *re);


-#endif /* INITRENDER_H */
+#endif /* __INITRENDER_H__ */

--- a/source/blender/render/intern/include/occlusion.h
+++ b/source/blender/render/intern/include/occlusion.h
@@ -31,8 +31,8 @@
 */


-#ifndef OCCLUSION_H
-#define OCCLUSION_H
+#ifndef __OCCLUSION_H__
+#define __OCCLUSION_H__

 struct Render;
 struct ShadeInput;
--- a/source/blender/render/intern/include/pixelblending.h
+++ b/source/blender/render/intern/include/pixelblending.h
@@ -28,8 +28,8 @@
 */


-#ifndef PIXELBLENDING_EXT_H
-#define PIXELBLENDING_EXT_H 
+#ifndef __PIXELBLENDING_H__
+#define __PIXELBLENDING_H__ 


 /**
@@ -69,5 +69,5 @@ void addalphaUnderGammaFloat(float *doel, float *bron);



-#endif /* PIXELBLENDING_EXT_H */
+#endif /* __PIXELBLENDING_H__ */

--- a/source/blender/render/intern/include/pixelshading.h
+++ b/source/blender/render/intern/include/pixelshading.h
@@ -34,8 +34,8 @@
 */


-#ifndef PIXELSHADING_H
-#define PIXELSHADING_H
+#ifndef __PIXELSHADING_H__
+#define __PIXELSHADING_H__

 /**
 * Render the pixel at (x,y) for object ap. Apply the jitter mask. 
--- a/source/blender/render/intern/include/pointdensity.h
+++ b/source/blender/render/intern/include/pointdensity.h
@@ -30,8 +30,8 @@
 */


-#ifndef POINTDENSITY_H
-#define POINTDENSITY_H 
+#ifndef __POINTDENSITY_H__
+#define __POINTDENSITY_H__ 

 /**
 * Make point density kd-trees for all point density textures in the scene
@@ -45,5 +45,5 @@ void make_pointdensities(struct Render *re);
 void free_pointdensities(struct Render *re);
 int pointdensitytex(struct Tex *tex, float *texvec, struct TexResult *texres);

-#endif /* POINTDENSITY_H */
+#endif /* __POINTDENSITY_H__ */

--- a/source/blender/render/intern/include/raycounter.h
+++ b/source/blender/render/intern/include/raycounter.h
@@ -30,8 +30,8 @@
 */


-#ifndef RE_RAYCOUNTER_H
-#define RE_RAYCOUNTER_H
+#ifndef __RAYCOUNTER_H__
+#define __RAYCOUNTER_H__

 //#define RE_RAYCOUNTER			/* enable counters per ray, useful for measuring raytrace structures performance */

--- a/source/blender/render/intern/include/rayintersection.h
+++ b/source/blender/render/intern/include/rayintersection.h
@@ -31,8 +31,8 @@
 */


-#ifndef __RENDER_RAYINTERSECTION_H__
-#define __RENDER_RAYINTERSECTION_H__
+#ifndef __RAYINTERSECTION_H__
+#define __RAYINTERSECTION_H__

 #ifdef __cplusplus
 extern "C" {
@@ -123,5 +123,5 @@ typedef struct Isect {
 }
 #endif

-#endif /* __RENDER_RAYINTERSECTION_H__ */
+#endif /* __RAYINTERSECTION_H__ */

--- a/source/blender/render/intern/include/rayobject.h
+++ b/source/blender/render/intern/include/rayobject.h
@@ -30,8 +30,8 @@
 */


-#ifndef RE_RAYOBJECT_H
-#define RE_RAYOBJECT_H
+#ifndef __RAYOBJECT_H__
+#define __RAYOBJECT_H__

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -29,8 +29,8 @@
 *  \ingroup render
 */

-#ifndef RENDER_RESULT_H
-#define RENDER_RESULT_H
+#ifndef __RENDER_RESULT_H__
+#define __RENDER_RESULT_H__

 #define PASS_VECTOR_MAX	10000.0f

@@ -90,5 +90,5 @@ void render_result_rect_fill_zero(struct RenderResult *rr);
 void render_result_rect_get_pixels(struct RenderResult *rr, struct RenderData *rd,
 	unsigned int *rect, int rectx, int recty);

-#endif /* RENDER_RESULT_H */
+#endif /* __RENDER_RESULT_H__ */

--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -28,8 +28,8 @@
 */


-#ifndef RENDER_TYPES_H
-#define RENDER_TYPES_H
+#ifndef __RENDER_TYPES_H__
+#define __RENDER_TYPES_H__

 /* ------------------------------------------------------------------------- */
 /* exposed internal in render module only! */
@@ -628,5 +628,5 @@ typedef struct LampRen {
 #define R_ENV_TRANSFORMED	2
 #define R_TRANSFORMED		(1|2)

-#endif /* RENDER_TYPES_H */
+#endif /* __RENDER_TYPES_H__ */

--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -33,8 +33,8 @@
 */


-#ifndef RENDERCORE_H
-#define RENDERCORE_H 
+#ifndef __RENDERCORE_H__
+#define __RENDERCORE_H__ 

 #include "render_types.h"

--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -30,8 +30,8 @@
 */


-#ifndef RENDERDATABASE_H
-#define RENDERDATABASE_H
+#ifndef __RENDERDATABASE_H__
+#define __RENDERDATABASE_H__

 struct Object;
 struct VlakRen;
@@ -144,5 +144,5 @@ void init_render_world(Render *re);
 void RE_Database_FromScene_Vectors(Render *re, struct Main *bmain, struct Scene *sce, unsigned int lay);


-#endif /* RENDERDATABASE_H */
+#endif /* __RENDERDATABASE_H__ */

--- a/source/blender/render/intern/include/renderpipeline.h
+++ b/source/blender/render/intern/include/renderpipeline.h
@@ -30,8 +30,8 @@
 */


-#ifndef PIPELINE_H
-#define PIPELINE_H
+#ifndef __RENDERPIPELINE_H__
+#define __RENDERPIPELINE_H__

 struct Render;
 struct RenderLayer;
@@ -40,5 +40,5 @@ struct RenderResult;
 struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr);
 float panorama_pixel_rot(struct Render *re);

-#endif /* PIPELINE_H */
+#endif /* __RENDERPIPELINE_H__ */

--- a/source/blender/render/intern/include/shadbuf.h
+++ b/source/blender/render/intern/include/shadbuf.h
@@ -33,8 +33,8 @@
 */


-#ifndef SHADBUF_EXT_H
-#define SHADBUF_EXT_H
+#ifndef __SHADBUF_H__
+#define __SHADBUF_H__

 #include "render_types.h"

@@ -114,5 +114,5 @@ typedef struct ISBData {
 	int minx, miny, rectx, recty;	/* copy from part disprect */
 } ISBData;

-#endif /* SHADBUF_EXT_H */
+#endif /* __SHADBUF_H__ */

--- a/source/blender/render/intern/include/sss.h
+++ b/source/blender/render/intern/include/sss.h
@@ -30,8 +30,8 @@
 */


-#ifndef SSS_H
-#define SSS_H
+#ifndef __SSS_H__
+#define __SSS_H__

 /* Generic multiple scattering API */

@@ -64,5 +64,5 @@ void free_sss(struct Render *re);
 int sample_sss(struct Render *re, struct Material *mat, float *co, float *col);
 int sss_pass_done(struct Render *re, struct Material *mat);

-#endif /*SSS_H*/
+#endif /*__SSS_H__*/

--- a/source/blender/render/intern/include/strand.h
+++ b/source/blender/render/intern/include/strand.h
@@ -30,8 +30,8 @@
 */


-#ifndef STRAND_H
-#define STRAND_H 
+#ifndef __STRAND_H__
+#define __STRAND_H__ 

 struct StrandVert;
 struct StrandRen;
--- a/source/blender/render/intern/include/sunsky.h
+++ b/source/blender/render/intern/include/sunsky.h
@@ -29,8 +29,8 @@
 * and example code from Brian Smits, another author of that paper in 
 * http://www.cs.utah.edu/vissim/papers/sunsky/code/
 * */
-#ifndef SUNSKY_H_
-#define SUNSKY_H_
+#ifndef __SUNSKY_H__
+#define __SUNSKY_H__

 #define SPECTRUM_MAX_COMPONENTS     100
 #define SPECTRUM_START              350.0
@@ -146,4 +146,4 @@ void AtmospherePixleShader( struct SunSky* sunSky, float view[3], float s, float
 * */
 void ClipColor(float c[3]);

-#endif /*SUNSKY_H_*/
+#endif /*__SUNSKY_H__*/
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -33,8 +33,8 @@
 */


-#ifndef TEXTURE_EXT_H
-#define TEXTURE_EXT_H
+#ifndef __TEXTURE_H__
+#define __TEXTURE_H__

 #define BRICONT                                                               \
 	texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f;         \
@@ -85,5 +85,5 @@ int imagewraposa(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const f
 int imagewrap(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const float texvec[3], struct TexResult *texres);
 void image_sample(struct Image *ima, float fx, float fy, float dx, float dy, float *result);

-#endif /* TEXTURE_EXT_H */
+#endif /* __TEXTURE_H__ */

--- a/source/blender/render/intern/include/voxeldata.h
+++ b/source/blender/render/intern/include/voxeldata.h
@@ -30,8 +30,8 @@
 */


-#ifndef VOXELDATA_H
-#define VOXELDATA_H 
+#ifndef __VOXELDATA_H__
+#define __VOXELDATA_H__ 

 struct Render;
 struct TexResult;
@@ -47,4 +47,4 @@ void make_voxeldata(struct Render *re);
 void free_voxeldata(struct Render *re);
 int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texres);

-#endif /* VOXELDATA_H */
+#endif /* __VOXELDATA_H__ */
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -30,8 +30,8 @@
 */


-#ifndef ZBUF_H
-#define ZBUF_H
+#ifndef __ZBUF_H__
+#define __ZBUF_H__

 struct RenderPart;
 struct RenderLayer;
--- a/source/blender/render/intern/raytrace/bvh.h
+++ b/source/blender/render/intern/raytrace/bvh.h
@@ -46,8 +46,8 @@
 #include <xmmintrin.h>
 #endif

-#ifndef RE_RAYTRACE_BVH_H
-#define RE_RAYTRACE_BVH_H
+#ifndef __BVH_H__
+#define __BVH_H__

 #ifdef __SSE__
 inline int test_bb_group4(__m128 *bb_group, const Isect *isec)
--- a/source/blender/render/intern/raytrace/rayobject_hint.h
+++ b/source/blender/render/intern/raytrace/rayobject_hint.h
@@ -30,8 +30,8 @@
 */


-#ifndef RE_RAYTRACE_RAYOBJECT_HINT_H
-#define RE_RAYTRACE_RAYOBJECT_HINT_H
+#ifndef __RAYOBJECT_HINT_H__
+#define __RAYOBJECT_HINT_H__

 #define HINT_RECURSE	 1
 #define HINT_ACCEPT		 0
--- a/source/blender/render/intern/raytrace/rayobject_internal.h
+++ b/source/blender/render/intern/raytrace/rayobject_internal.h
@@ -2,8 +2,8 @@
 *  \ingroup render
 */

-#ifndef RE_RAYOBJECT_INTERNAL_H
-#define RE_RAYOBJECT_INTERNAL_H
+#ifndef __RAYOBJECT_INTERNAL_H__
+#define __RAYOBJECT_INTERNAL_H__

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.h
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.h
@@ -29,8 +29,8 @@
 *  \ingroup render
 */

-#ifndef RE_RAYOBJECT_RTBUILD_H
-#define RE_RAYOBJECT_RTBUILD_H
+#ifndef __RAYOBJECT_RTBUILD_H__
+#define __RAYOBJECT_RTBUILD_H__

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/render/intern/raytrace/svbvh.h
+++ b/source/blender/render/intern/raytrace/svbvh.h
@@ -32,8 +32,8 @@

 #ifdef __SSE__
 
-#ifndef RE_RAYTRACE_SVBVH_H
-#define RE_RAYTRACE_SVBVH_H
+#ifndef __SVBVH_H__
+#define __SVBVH_H__

 #include "bvh.h"
 #include "BLI_memarena.h"
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -206,7 +206,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens)
 		maxz*= lar->sh_zfac;
 		maxy= lar->imat[0][1]*p1[0]+lar->imat[1][1]*p1[1]+lar->imat[2][1]*p1[2];

-		if( fabsf(nray[2]) < FLT_EPSILON ) use_yco= 1;
+		if( fabs(nray[2]) < FLT_EPSILON ) use_yco= 1;
 	}
 	
 	/* scale z to make sure volume is normalized */