[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50814] trunk/blender/source/blender/ makesrna/intern: Revert a small part of r50813, so that we can build ( actually, link) with Cycles!

[Bastien Montagne]

Revision: 50814
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50814
Author:   mont29
Date:     2012-09-22 17:00:02 +0000 (Sat, 22 Sep 2012)
Log Message:
-----------
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... ;)

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50813

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_color.c
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c
    trunk/blender/source/blender/makesrna/intern/rna_render.c
    trunk/blender/source/blender/makesrna/intern/rna_scene_api.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_color.c	2012-09-22 14:07:55 UTC (rev 50813)
+++ trunk/blender/source/blender/makesrna/intern/rna_color.c	2012-09-22 17:00:02 UTC (rev 50814)
@@ -314,7 +314,7 @@
 	}
 }
 
-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);
 }

Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2012-09-22 14:07:55 UTC (rev 50813)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2012-09-22 17:00:02 UTC (rev 50814)
@@ -243,7 +243,7 @@
 	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);

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2012-09-22 14:07:55 UTC (rev 50813)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2012-09-22 17:00:02 UTC (rev 50814)
@@ -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 @@
 		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 @@
 	/* 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 @@
 	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;
 }

Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c	2012-09-22 14:07:55 UTC (rev 50813)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c	2012-09-22 17:00:02 UTC (rev 50814)
@@ -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 @@
 	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 @@
 	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);

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2012-09-22 14:07:55 UTC (rev 50813)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2012-09-22 17:00:02 UTC (rev 50814)
@@ -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;