diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
| commit | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (patch) | |
| tree | 2c7496c8c656565d2ac6dc0901e1af66f8565101 /source/blender/render | |
| parent | c1ceab1281ccf061f03f8000bf190a082a5385d8 (diff) | |
| parent | 7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad (diff) | |
svn merge ^/trunk/blender -r55357:55372
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_internal.h | 8 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/renderdatabase.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_internal.h b/source/blender/render/intern/raytrace/rayobject_internal.h index aa8ab8c3da4..07a1cd26c47 100644 --- a/source/blender/render/intern/raytrace/rayobject_internal.h +++ b/source/blender/render/intern/raytrace/rayobject_internal.h @@ -103,12 +103,12 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c); #define RE_rayobject_isVlakPrimitive(o) ((((intptr_t)o)&3) == 3) /* used to align a given ray object */ -#define RE_rayobject_align(o) ((RayObject*)(((intptr_t)o)&(~3))) +#define RE_rayobject_align(o) ((RayObject *)(((intptr_t)o)&(~3))) /* used to unalign a given ray object */ -#define RE_rayobject_unalignRayFace(o) ((RayObject*)(((intptr_t)o)|1)) -#define RE_rayobject_unalignRayAPI(o) ((RayObject*)(((intptr_t)o)|2)) -#define RE_rayobject_unalignVlakPrimitive(o) ((RayObject*)(((intptr_t)o)|3)) +#define RE_rayobject_unalignRayFace(o) ((RayObject *)(((intptr_t)o)|1)) +#define RE_rayobject_unalignRayAPI(o) ((RayObject *)(((intptr_t)o)|2)) +#define RE_rayobject_unalignVlakPrimitive(o) ((RayObject *)(((intptr_t)o)|3)) /* * This rayobject represents a generic object. With it's own callbacks for raytrace operations. diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 753eab4c6ab..64598063a8f 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1500,7 +1500,7 @@ static void tag_scenes_for_render(Render *re) if (node->id) { if (!MAIN_VERSION_ATLEAST(re->main, 265, 5)) { if (rlayer_node_uses_alpha(re->scene->nodetree, node)) { - Scene *scene = (Scene*) node->id; + Scene *scene = (Scene *)node->id; if (scene->r.alphamode != R_ALPHAPREMUL) { BKE_reportf(re->reports, RPT_WARNING, "Setting scene %s alpha mode to Premul", scene->id.name + 2); diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 0a8af1c368b..8169250f74f 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -938,7 +938,7 @@ HaloRen *RE_findOrAddHalo(ObjectRen *obr, int nr) // TABLEINITSIZE, obr->blohalen+TABLEINITSIZE ); temp=obr->bloha; - obr->bloha = (HaloRen**)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha"); + obr->bloha = (HaloRen **)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha"); if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void *)); memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE * sizeof(void *)); obr->blohalen+=TABLEINITSIZE; /*Does this really need to be power of 2?*/ |