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

Note: this is marked as hack/todo in cycles code, so it needs a proper fix, but at least it works, for now... ;)

diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 2e9866ee428a6fbc61a2a533133de92faa95ca2d..d4f21a8d04ed41d94a492fbc105434bbe7773835 100644 (file)
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -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);
 }
 {
        do_colorband(coba, position, color);
 }

diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 42f8ea2d796da5d4271f072bb77e2faa8b0b89c7..d81b6e50872a794cde678785791e73fa81e37901 100644 (file)
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -243,7 +243,7 @@ static Mesh *rna_Main_meshes_new(Main *UNUSED(bmain), const char *name)
        id_us_min(&me->id);
        return me;
 }
        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);
 {
        if (ID_REAL_USERS(mesh) <= 0)
                BKE_libblock_free(&bmain->mesh, mesh);

diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 5aadbfa7269ff1594bb669ebd155c5d4039daa69..1263e7716ddd040d5fb43b8d1656992d4ba400da 100644 (file)
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -74,7 +74,7 @@
 
 /* copied from Mesh_getFromObject and adapted to RNA interface */
 /* settings: 0 - preview, 1 - render */
 
 /* 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;
 {
        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 */
                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");
 {
        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 */
 }
 
        /* 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);
 {
        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;
 }
 
        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;
 }
 
 {
        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;
 }
 {
        return BKE_object_is_deform_modified(scene, ob) & settings;
 }

diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 685e1ef7f1141e0c0edc640abc23218d7fb00c01..d2e4e8edbfbaab50480429f213b2e18d9f77dadb 100644 (file)
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -50,12 +50,12 @@
 
 /* RenderEngine Callbacks */
 
 
 /* RenderEngine Callbacks */
 

-static void engine_tag_redraw(RenderEngine *engine)
+void engine_tag_redraw(RenderEngine *engine)

 {
        engine->flag |= RE_ENGINE_DO_DRAW;
 }
 
 {
        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;
 }
 {
        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);
 }
 
        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);
 {
        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);
 }
 
        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);
 {
        RenderPass *rpass = (RenderPass *)ptr->data;
        memcpy(rpass->rect, values, sizeof(float) * rpass->rectx * rpass->recty * rpass->channels);

diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 10efc7a94a7e6f02a02c34b21df02cff1d5f992a..cdf7ac5e68fce2991f27a28fab76a00463b889a8 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -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;
 {
        scene->r.cfra = frame;
        scene->r.subframe = subframe;