Revision: 42095
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42095
Author: nazgul
Date: 2011-11-23 16:44:33 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Fix compilation error of blenderplayer caused by recent commit.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h 2011-11-23
16:39:07 UTC (rev 42094)
+++ trunk/blender/source/blender/editors/include/ED_object.h 2011-11-23
16:44:33 UTC (rev 42095)
@@ -139,7 +139,7 @@
struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct
Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int
type);
int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain,
struct Scene *scene, struct Object *ob, struct ModifierData *md);
-int ED_object_modifier_clear(struct Main *bmain, struct Scene *scene, struct
Object *ob);
+void ED_object_modifier_clear(struct Main *bmain, struct Scene *scene, struct
Object *ob);
int ED_object_modifier_move_down(struct ReportList *reports, struct Object
*ob, struct ModifierData *md);
int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob,
struct ModifierData *md);
int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain,
struct Scene *scene, struct Object *ob, struct ModifierData *md);
Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c
2011-11-23 16:39:07 UTC (rev 42094)
+++ trunk/blender/source/blender/editors/object/object_modifier.c
2011-11-23 16:44:33 UTC (rev 42095)
@@ -259,13 +259,13 @@
return 1;
}
-int ED_object_modifier_clear(Main *bmain, Scene *scene, Object *ob)
+void ED_object_modifier_clear(Main *bmain, Scene *scene, Object *ob)
{
ModifierData *md =ob->modifiers.first;
int sort_depsgraph = 0;
if(!md)
- return 0;
+ return;
while(md) {
ModifierData *next_md;
@@ -282,8 +282,6 @@
/* sorting has to be done after the update so that dynamic systems can
react properly */
if(sort_depsgraph)
DAG_scene_sort(bmain, scene);
-
- return 1;
}
int ED_object_modifier_move_up(ReportList *reports, Object *ob, ModifierData
*md)
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2011-11-23 16:39:07 UTC (rev 42094)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2011-11-23 16:44:33 UTC (rev 42095)
@@ -263,6 +263,7 @@
void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float
*dist){}
struct BGpic *ED_view3D_background_image_new(struct View3D *v3d){return
(struct BGpic *) NULL;}
void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic
*bgpic){}
+void ED_view3D_background_image_clear(struct View3D *v3d){}
void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist){}
int text_file_modified(struct Text *text){return 0;}
void ED_node_shader_default(struct Material *ma){}
@@ -270,6 +271,7 @@
void ED_base_object_select(struct Base *base, short mode){}
int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene,
struct Object *ob, struct ModifierData *md){return 0;}
int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene,
struct Object *ob, char *name, int type){return 0;}
+void ED_object_modifier_clear(struct Scene *scene, struct Object *ob){}
void ED_object_enter_editmode(struct bContext *C, int flag){}
void ED_object_exit_editmode(struct bContext *C, int flag){}
int uiLayoutGetActive(struct uiLayout *layout){return 0;}
@@ -303,6 +305,7 @@
void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int
vertnum){}
void ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int
vertnum){}
void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup){}
+void ED_vgroup_clear(struct Object *ob){}
void ED_vgroup_object_is_edit_mode(struct Object *ob){}
void ED_sequencer_update_view(struct bContext *C, int view){}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
