[Bf-blender-cvs] [49ca3fd] master: Fix compile due forgot remove BKE_scene_omp_threads_update from patch

Jens Verwiebe noreply at git.blender.org
Mon Mar 31 14:53:47 CEST 2014


Commit: 49ca3fdf16d9748535e4cb9daa91f1e8a4e54040
Author: Jens Verwiebe
Date:   Mon Mar 31 14:53:30 2014 +0200
https://developer.blender.org/rB49ca3fdf16d9748535e4cb9daa91f1e8a4e54040

Fix compile due forgot remove BKE_scene_omp_threads_update from patch

===================================================================

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 972db36..5fe8904 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -138,7 +138,6 @@ int BKE_scene_num_threads(const struct Scene *scene);
 int BKE_render_num_threads(const struct RenderData *r);
 
 int BKE_scene_num_omp_threads(const struct Scene *scene);
-void BKE_scene_omp_threads_update(const struct Scene *scene);
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index d1b04bd..b374e95 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -681,11 +681,6 @@ static char *rna_RenderSettings_path(PointerRNA *UNUSED(ptr))
 	return BLI_sprintfN("render");
 }
 
-static void rna_omp_threads_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNUSED(ptr))
-{
-	BKE_scene_omp_threads_update(scene);
-}
-
 static int rna_omp_threads_get(PointerRNA *ptr)
 {
 	Scene *scene = (Scene *)ptr->data;




More information about the Bf-blender-cvs mailing list