[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46314] trunk/blender: code cleanup: BKE_scene api naming.
Campbell Barton
ideasman42 at gmail.com
Sat May 5 16:33:36 CEST 2012
Revision: 46314
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46314
Author: campbellbarton
Date: 2012-05-05 14:33:36 +0000 (Sat, 05 May 2012)
Log Message:
-----------
code cleanup: BKE_scene api naming.
also stop numpy from being found in /usr/include with cmake.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/blender/blender_object.cpp
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/blender/blender_sync.h
trunk/blender/intern/cycles/blender/blender_util.h
trunk/blender/source/blender/blenkernel/BKE_scene.h
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/group.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/include/ED_keyframing.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_header.c
trunk/blender/source/blender/editors/space_node/node_templates.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/nodes/shader/node_shader_tree.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/CMakeLists.txt 2012-05-05 14:33:36 UTC (rev 46314)
@@ -1641,6 +1641,7 @@
PATH_SUFFIXES
site-packages
dist-packages
+ NO_DEFAULT_PATH
)
if(NOT EXISTS "${PYTHON_NUMPY_PATH}")
Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp 2012-05-05 14:33:36 UTC (rev 46314)
@@ -202,7 +202,7 @@
{
/* test if we can instance or if the object is modified */
BL::ID b_ob_data = b_ob.data();
- BL::ID key = (object_is_modified(b_ob))? b_ob: b_ob_data;
+ BL::ID key = (BKE_object_is_modified(b_ob))? b_ob: b_ob_data;
BL::Material material_override = render_layer.material_override;
/* find shader indices */
@@ -309,7 +309,7 @@
/* skip objects without deforming modifiers. this is not a totally reliable,
* would need a more extensive check to see which objects are animated */
- if(!size || !ccl::object_is_deform_modified(b_ob, b_scene, preview))
+ if(!size || !ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview))
return;
/* get derived mesh */
Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp 2012-05-05 14:33:36 UTC (rev 46314)
@@ -34,10 +34,10 @@
/* Utilities */
-bool BlenderSync::object_is_modified(BL::Object b_ob)
+bool BlenderSync::BKE_object_is_modified(BL::Object b_ob)
{
/* test if we can instance or if the object is modified */
- if(ccl::object_is_modified(b_ob, b_scene, preview)) {
+ if(ccl::BKE_object_is_modified(b_ob, b_scene, preview)) {
/* modifiers */
return true;
}
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-05-05 14:33:36 UTC (rev 46314)
@@ -87,7 +87,7 @@
if(object_is_mesh(*b_ob)) {
if(b_ob->is_updated_data() || b_ob->data().is_updated()) {
- BL::ID key = object_is_modified(*b_ob)? *b_ob: b_ob->data();
+ BL::ID key = BKE_object_is_modified(*b_ob)? *b_ob: b_ob->data();
mesh_map.set_recalc(key);
}
}
Modified: trunk/blender/intern/cycles/blender/blender_sync.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.h 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/intern/cycles/blender/blender_sync.h 2012-05-05 14:33:36 UTC (rev 46314)
@@ -88,7 +88,7 @@
/* util */
void find_shader(BL::ID id, vector<uint>& used_shaders, int default_shader);
- bool object_is_modified(BL::Object b_ob);
+ bool BKE_object_is_modified(BL::Object b_ob);
bool object_is_mesh(BL::Object b_ob);
bool object_is_light(BL::Object b_ob);
Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/intern/cycles/blender/blender_util.h 2012-05-05 14:33:36 UTC (rev 46314)
@@ -91,12 +91,12 @@
rna_Object_free_duplilist(self.ptr.data, NULL);
}
-static inline bool object_is_modified(BL::Object self, BL::Scene scene, bool preview)
+static inline bool BKE_object_is_modified(BL::Object self, BL::Scene scene, bool preview)
{
return rna_Object_is_modified(self.ptr.data, scene.ptr.data, (preview)? (1<<0): (1<<1))? true: false;
}
-static inline bool object_is_deform_modified(BL::Object self, BL::Scene scene, bool preview)
+static inline bool BKE_object_is_deform_modified(BL::Object self, BL::Scene scene, bool preview)
{
return rna_Object_is_deform_modified(self.ptr.data, scene.ptr.data, (preview)? (1<<0): (1<<1))? true: false;
}
Modified: trunk/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_scene.h 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/source/blender/blenkernel/BKE_scene.h 2012-05-05 14:33:36 UTC (rev 46314)
@@ -62,39 +62,43 @@
void free_qtcodecdata(struct QuicktimeCodecData *acd);
void BKE_scene_free(struct Scene *sce);
-struct Scene *add_scene(const char *name);
-struct Base *object_in_scene(struct Object *ob, struct Scene *sce);
+struct Scene *BKE_scene_add(const char *name);
-void set_scene_bg(struct Main *bmain, struct Scene *sce);
-struct Scene *set_scene_name(struct Main *bmain, const char *name);
+/* base functions */
+struct Base *BKE_scene_base_find(struct Scene *scene, struct Object *ob);
+struct Base *BKE_scene_base_add(struct Scene *sce, struct Object *ob);
+void BKE_scene_base_deselect_all(struct Scene *sce);
+void BKE_scene_base_select(struct Scene *sce, struct Base *selbase);
+int BKE_scene_base_iter_next(struct Scene **scene, int val, struct Base **base, struct Object **ob);
-struct Scene *copy_scene(struct Scene *sce, int type);
-void unlink_scene(struct Main *bmain, struct Scene *sce, struct Scene *newsce);
+void BKE_scene_base_flag_to_objects(struct Scene *scene);
+void BKE_scene_base_flag_from_objects(struct Scene *scene);
-int next_object(struct Scene **scene, int val, struct Base **base, struct Object **ob);
-struct Object *scene_find_camera(struct Scene *sc);
-struct Object *scene_camera_switch_find(struct Scene *scene); // DURIAN_CAMERA_SWITCH
-int scene_camera_switch_update(struct Scene *scene);
+void BKE_scene_set_background(struct Main *bmain, struct Scene *sce);
+struct Scene *BKE_scene_set_name(struct Main *bmain, const char *name);
-char *scene_find_marker_name(struct Scene *scene, int frame);
-char *scene_find_last_marker_name(struct Scene *scene, int frame);
+struct Scene *BKE_scene_copy(struct Scene *sce, int type);
+void BKE_scene_unlink(struct Main *bmain, struct Scene *sce, struct Scene *newsce);
-struct Base *scene_add_base(struct Scene *sce, struct Object *ob);
-void scene_deselect_all(struct Scene *sce);
-void scene_select_base(struct Scene *sce, struct Base *selbase);
+struct Object *BKE_scene_camera_find(struct Scene *sc);
+struct Object *BKE_scene_camera_switch_find(struct Scene *scene); // DURIAN_CAMERA_SWITCH
+int BKE_scene_camera_switch_update(struct Scene *scene);
+char *BKE_scene_find_marker_name(struct Scene *scene, int frame);
+char *BKE_scene_find_last_marker_name(struct Scene *scene, int frame);
+
/* checks for cycle, returns 1 if it's all OK */
-int scene_check_setscene(struct Main *bmain, struct Scene *sce);
+int BKE_scene_validate_setscene(struct Main *bmain, struct Scene *sce);
-float BKE_curframe(struct Scene *scene);
-float BKE_frame_to_ctime(struct Scene *scene, const float frame);
+float BKE_scene_frame_get(struct Scene *scene);
+float BKE_scene_frame_get_from_ctime(struct Scene *scene, const float frame);
-void scene_update_tagged(struct Main *bmain, struct Scene *sce);
+void BKE_scene_update_tagged(struct Main *bmain, struct Scene *sce);
-void scene_update_for_newframe(struct Main *bmain, struct Scene *sce, unsigned int lay);
+void BKE_scene_update_for_newframe(struct Main *bmain, struct Scene *sce, unsigned int lay);
-struct SceneRenderLayer *scene_add_render_layer(struct Scene *sce, const char *name);
-int scene_remove_render_layer(struct Main *main, struct Scene *scene, struct SceneRenderLayer *srl);
+struct SceneRenderLayer *BKE_scene_add_render_layer(struct Scene *sce, const char *name);
+int BKE_scene_remove_render_layer(struct Main *main, struct Scene *scene, struct SceneRenderLayer *srl);
/* render profile */
int get_render_subsurf_level(struct RenderData *r, int level);
@@ -102,11 +106,8 @@
int get_render_shadow_samples(struct RenderData *r, int samples);
float get_render_aosss_error(struct RenderData *r, float error);
-int scene_use_new_shading_nodes(struct Scene *scene);
+int BKE_scene_use_new_shading_nodes(struct Scene *scene);
-void copy_baseflags(struct Scene *scene);
-void copy_objectflags(struct Scene *scene);
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2012-05-05 14:33:36 UTC (rev 46314)
@@ -1453,7 +1453,7 @@
bActionStrip *strip, *striplast=NULL, *stripfirst=NULL;
float striptime, frametime, length, actlength;
float blendfac, stripframe;
- float scene_cfra= BKE_curframe(scene);
+ float scene_cfra= BKE_scene_frame_get(scene);
int doit, dostride;
if (blocktype==ID_AR) {
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-05-05 14:03:12 UTC (rev 46313)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-05-05 14:33:36 UTC (rev 46314)
@@ -353,7 +353,7 @@
* that doesn't force complete update, but for now, this is the
* most accurate way!
*/
- scene_update_for_newframe(G.main, scene, scene->lay); // XXX this is the best way we can get anything moving
+ BKE_scene_update_for_newframe(G.main, scene, scene->lay); // XXX this is the best way we can get anything moving
#endif
}
@@ -1249,7 +1249,7 @@
if (G.rendering == 0)
no_draw_flag |= PARS_NO_DISP;
- ctime = BKE_curframe(scene); /* NOTE: in old animsys, used parent object's timeoffset... */
+ ctime = BKE_scene_frame_get(scene); /* NOTE: in old animsys, used parent object's timeoffset... */
totpart = psys->totpart;
totchild = psys->totchild;
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-05-05 14:03:12 UTC (rev 46313)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list