[Bf-blender-cvs] [c39fcf9] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

Lukas Tönne noreply at git.blender.org
Wed May 7 16:02:07 CEST 2014


Commit: c39fcf9ee7c94ddbf2e4ab02644f7de18d3947e3
Author: Lukas Tönne
Date:   Wed May 7 15:07:17 2014 +0200
https://developer.blender.org/rBc39fcf9ee7c94ddbf2e4ab02644f7de18d3947e3

Merge branch 'master' into depsgraph_refactor

Conflicts:
	source/blender/makesrna/intern/rna_scene.c

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



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

diff --cc source/blender/makesrna/intern/rna_scene.c
index 77b542a,94cb194..300fa1a
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -5520,27 -5602,6 +5660,17 @@@ void RNA_def_scene(BlenderRNA *brna
  	RNA_def_property_struct_type(prop, "ColorManagedSequencerColorspaceSettings");
  	RNA_def_property_ui_text(prop, "Sequencer Color Space Settings", "Settings of color space sequencer is working in");
  
- 	prop = RNA_def_property(srna, "omp_threads", PROP_INT, PROP_NONE);
- 	RNA_def_property_range(prop, 1, BLENDER_MAX_THREADS);
- 	RNA_def_property_int_funcs(prop, "rna_omp_threads_get", NULL, NULL);
- 	RNA_def_property_ui_text(prop, "OpenMP Threads",
- 	                         "Number of CPU threads to use for openmp");
- 
- 	prop = RNA_def_property(srna, "omp_threads_mode", PROP_ENUM, PROP_NONE);
- 	RNA_def_property_enum_items(prop, omp_threads_mode_items);
- 	RNA_def_property_ui_text(prop, "OpenMP Mode", "Determine the amount of openmp threads used");
 +
 +	/* Dependency Graph */
 +	prop = RNA_def_property(srna, "depsgraph", PROP_POINTER, PROP_NONE);
 +	RNA_def_property_struct_type(prop, "Depsgraph");
 +	RNA_def_property_ui_text(prop, "Dependency Graph", "Dependencies in the scene data");
 +
 +	func = RNA_def_function(srna, "depsgraph_rebuild", "rna_Scene_depsgraph_rebuild");
 +	RNA_def_function_flag(func, FUNC_USE_MAIN);
 +	RNA_def_function_ui_description(func, "Rebuild the dependency graph");
 +	parm = RNA_def_string_file_path(func, "debug_filename", NULL, FILE_MAX, "Debug File Name",
 +	                                "Optional file in which to store graphviz debug output");
- 
  	/* Nestled Data  */
  	/* *** Non-Animated *** */
  	RNA_define_animate_sdna(false);
diff --cc source/blender/windowmanager/intern/wm_playanim.c
index 17bebd8,cb263dc..7b163eb
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@@ -59,13 -58,9 +58,11 @@@
  #include "IMB_imbuf_types.h"
  #include "IMB_imbuf.h"
  
- #include "BKE_blender.h"
  #include "BKE_depsgraph.h"
- #include "BKE_global.h"
  #include "BKE_image.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "BIF_gl.h"
  #include "BIF_glutil.h"




More information about the Bf-blender-cvs mailing list