griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert a small part of r50813, so that we can build (actually, link) with Cycles!

Browse Source 
Note: this is marked as hack/todo in cycles code, so it needs a proper fix, but at least it works, for now... ;)
This commit is contained in:
Bastien Montagne
2012-09-22 17:00:02 +00:00
parent 6c1da4d022
commit fb8ffefd1d
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_color.c
View File

@@ -314,7 +314,7 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
}
}
static void rna_ColorRamp_eval(struct ColorBand *coba, float position, float color[4])
void rna_ColorRamp_eval(struct ColorBand *coba, float position, float color[4])
{
do_colorband(coba, position, color);
}

2
source/blender/makesrna/intern/rna_main_api.c
View File

@@ -243,7 +243,7 @@ static Mesh *rna_Main_meshes_new(Main *UNUSED(bmain), const char *name)
id_us_min(&me->id);
return me;
}
static void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh)
void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh)
{
if (ID_REAL_USERS(mesh) <= 0)
BKE_libblock_free(&bmain->mesh, mesh);

10
source/blender/makesrna/intern/rna_object_api.c
View File

@@ -74,7 +74,7 @@
/* copied from Mesh_getFromObject and adapted to RNA interface */
/* settings: 0 - preview, 1 - render */
static Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_modifiers, int settings)
Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_modifiers, int settings)
{
Mesh *tmpmesh;
Curve *tmpcu = NULL, *copycu;
@@ -337,7 +337,7 @@ static void dupli_render_particle_set(Scene *scene, Object *ob, int level, int e
dupli_render_particle_set(scene, go->ob, level + 1, enable);
}
/* When no longer needed, duplilist should be freed with Object.free_duplilist */
static void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce)
void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce)
{
if (!(ob->transflag & OB_DUPLI)) {
BKE_report(reports, RPT_ERROR, "Object does not have duplis");
@@ -359,7 +359,7 @@ static void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *
/* ob->duplilist should now be freed with Object.free_duplilist */
}
static void rna_Object_free_duplilist(Object *ob)
void rna_Object_free_duplilist(Object *ob)
{
if (ob->duplilist) {
free_object_duplilist(ob->duplilist);
@@ -517,12 +517,12 @@ static void rna_ObjectBase_layers_from_view(Base *base, View3D *v3d)
base->lay = base->object->lay = v3d->lay;
}
static int rna_Object_is_modified(Object *ob, Scene *scene, int settings)
int rna_Object_is_modified(Object *ob, Scene *scene, int settings)
{
return BKE_object_is_modified(scene, ob) & settings;
}
static int rna_Object_is_deform_modified(Object *ob, Scene *scene, int settings)
int rna_Object_is_deform_modified(Object *ob, Scene *scene, int settings)
{
return BKE_object_is_deform_modified(scene, ob) & settings;
}

8
source/blender/makesrna/intern/rna_render.c
View File

@@ -50,12 +50,12 @@
/* RenderEngine Callbacks */
static void engine_tag_redraw(RenderEngine *engine)
void engine_tag_redraw(RenderEngine *engine)
{
engine->flag |= RE_ENGINE_DO_DRAW;
}
static void engine_tag_update(RenderEngine *engine)
void engine_tag_update(RenderEngine *engine)
{
engine->flag |= RE_ENGINE_DO_UPDATE;
}
@@ -234,7 +234,7 @@ static void rna_RenderLayer_rect_get(PointerRNA *ptr, float *values)
memcpy(values, rl->rectf, sizeof(float) * rl->rectx * rl->recty * 4);
}
static void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values)
void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values)
{
RenderLayer *rl = (RenderLayer *)ptr->data;
memcpy(rl->rectf, values, sizeof(float) * rl->rectx * rl->recty * 4);
@@ -256,7 +256,7 @@ static void rna_RenderPass_rect_get(PointerRNA *ptr, float *values)
memcpy(values, rpass->rect, sizeof(float) * rpass->rectx * rpass->recty * rpass->channels);
}
static void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values)
void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values)
{
RenderPass *rpass = (RenderPass *)ptr->data;
memcpy(rpass->rect, values, sizeof(float) * rpass->rectx * rpass->recty * rpass->channels);

2
source/blender/makesrna/intern/rna_scene_api.c
View File

@@ -53,7 +53,7 @@
static void rna_Scene_frame_set(Scene *scene, int frame, float subframe)
void rna_Scene_frame_set(Scene *scene, int frame, float subframe)
{
scene->r.cfra = frame;
scene->r.subframe = subframe;