Revision: 34701
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34701
Author: campbellbarton
Date: 2011-02-07 22:48:23 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
minor edits, no functional changes.
- BGE was getting MCol array and not using it.
- use list lookup functions for getting constraint from pose bone.
- use const char * in more places.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/source/blender/blenkernel/BKE_scene.h
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenloader/BLO_readfile.h
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_text/text_intern.h
trunk/blender/source/blender/windowmanager/wm_window.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2011-02-07
22:48:23 UTC (rev 34701)
@@ -674,7 +674,7 @@
XChangeProperty(m_display, m_window,
name, utf8str, 8, PropModeReplace,
(const unsigned char*) title.ReadPtr(),
- strlen(title.ReadPtr()));
+ title.Length());
// This should convert to valid x11 string
// and getTitle would need matching change
Modified: trunk/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_scene.h 2011-02-07 21:57:40 UTC
(rev 34700)
+++ trunk/blender/source/blender/blenkernel/BKE_scene.h 2011-02-07 22:48:23 UTC
(rev 34701)
@@ -62,7 +62,7 @@
struct Base *object_in_scene(struct Object *ob, struct Scene *sce);
void set_scene_bg(struct Main *bmain, struct Scene *sce);
-struct Scene *set_scene_name(struct Main *bmain, char *name);
+struct Scene *set_scene_name(struct Main *bmain, const char *name);
struct Scene *copy_scene(struct Scene *sce, int type);
void unlink_scene(struct Main *bmain, struct Scene *sce, struct Scene *newsce);
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2011-02-07
22:48:23 UTC (rev 34701)
@@ -419,7 +419,7 @@
/* ------------ General Target Matrix Tools ---------- */
/* function that sets the given matrix based on given vertex group in mesh */
-static void contarget_get_mesh_mat (Scene *scene, Object *ob, char *substring,
float mat[][4])
+static void contarget_get_mesh_mat (Scene *scene, Object *ob, const char
*substring, float mat[][4])
{
DerivedMesh *dm = NULL;
Mesh *me= ob->data;
@@ -524,7 +524,7 @@
}
/* function that sets the given matrix based on given vertex group in lattice
*/
-static void contarget_get_lattice_mat (Object *ob, char *substring, float
mat[][4])
+static void contarget_get_lattice_mat (Object *ob, const char *substring,
float mat[][4])
{
Lattice *lt= (Lattice *)ob->data;
@@ -582,7 +582,7 @@
/* generic function to get the appropriate matrix for most target cases */
/* The cases where the target can be object data have not been implemented */
-static void constraint_target_to_mat4 (Scene *scene, Object *ob, char
*substring, float mat[][4], short from, short to, float headtail)
+static void constraint_target_to_mat4 (Scene *scene, Object *ob, const char
*substring, float mat[][4], short from, short to, float headtail)
{
/* Case OBJECT */
if (!strlen(substring)) {
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2011-02-07
22:48:23 UTC (rev 34701)
@@ -581,7 +581,7 @@
}
/* called from creator.c */
-Scene *set_scene_name(Main *bmain, char *name)
+Scene *set_scene_name(Main *bmain, const char *name)
{
Scene *sce= (Scene *)find_id("SC", name);
if(sce) {
Modified: trunk/blender/source/blender/blenloader/BLO_readfile.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_readfile.h 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/blenloader/BLO_readfile.h 2011-02-07
22:48:23 UTC (rev 34701)
@@ -200,7 +200,7 @@
int BLO_is_a_library(const char *path, char *dir, char *group);
struct Main* BLO_library_append_begin(const struct bContext *C, BlendHandle**
bh, char *dir);
-void BLO_library_append_named_part(const struct bContext *C, struct Main
*mainl, BlendHandle** bh, char *name, int idcode, short flag);
+void BLO_library_append_named_part(const struct bContext *C, struct Main
*mainl, BlendHandle** bh, const char *name, int idcode, short flag);
void BLO_library_append_end(const struct bContext *C, struct Main *mainl,
BlendHandle** bh, int idcode, short flag);
/* deprecated */
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-02-07
22:48:23 UTC (rev 34701)
@@ -12500,7 +12500,7 @@
}
}
-static void append_named_part(const bContext *C, Main *mainl, FileData *fd,
char *name, int idcode, short flag)
+static void append_named_part(const bContext *C, Main *mainl, FileData *fd,
const char *name, int idcode, short flag)
{
Scene *scene= CTX_data_scene(C);
Object *ob;
@@ -12566,7 +12566,7 @@
}
}
-void BLO_library_append_named_part(const bContext *C, Main *mainl,
BlendHandle** bh, char *name, int idcode, short flag)
+void BLO_library_append_named_part(const bContext *C, Main *mainl,
BlendHandle** bh, const char *name, int idcode, short flag)
{
FileData *fd= (FileData*)(*bh);
append_named_part(C, mainl, fd, name, idcode, flag);
@@ -12744,7 +12744,7 @@
/* tentatively removed, Python should be able to use the split functions too:
*/
/* BLO_library_append_begin, BLO_library_append_end,
BLO_library_append_named_part */
#if 0
-void BLO_script_library_append(BlendHandle **bh, char *dir, char *name,
+void BLO_script_library_append(BlendHandle **bh, char *dir, const char *name,
int idcode, short flag, Main *mainvar, Scene *scene, ReportList
*reports)
{
FileData *fd= (FileData*)(*bh);
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2011-02-07
22:48:23 UTC (rev 34701)
@@ -194,7 +194,7 @@
struct bDeformGroup *ED_vgroup_add(struct Object *ob);
struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, const
char *name);
void ED_vgroup_delete(struct Object *ob,
struct bDeformGroup *defgroup);
-void ED_vgroup_select_by_name(struct Object
*ob, char *name);
+void ED_vgroup_select_by_name(struct Object
*ob, const char *name);
void ED_vgroup_data_create(struct ID *id);
int ED_vgroup_give_array(struct ID
*id, struct MDeformVert **dvert_arr, int *dvert_tot);
int ED_vgroup_copy_array(struct
Object *ob, struct Object *ob_from);
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2011-02-07 21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2011-02-07 22:48:23 UTC (rev 34701)
@@ -472,8 +472,8 @@
struct ThemeUI;
void ui_widget_color_init(struct ThemeUI *tui);
-void ui_draw_menu_item(struct uiFontStyle *fstyle, rcti *rect, char *name, int
iconid, int state);
-void ui_draw_preview_item(struct uiFontStyle *fstyle, rcti *rect, char *name,
int iconid, int state);
+void ui_draw_menu_item(struct uiFontStyle *fstyle, rcti *rect, const char
*name, int iconid, int state);
+void ui_draw_preview_item(struct uiFontStyle *fstyle, rcti *rect, const char
*name, int iconid, int state);
/* interface_style.c */
void uiStyleInit(void);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2011-02-07 21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2011-02-07 22:48:23 UTC (rev 34701)
@@ -3080,7 +3080,7 @@
/* helper call to draw a menu item without button */
/* state: UI_ACTIVE or 0 */
-void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, char *name, int
iconid, int state)
+void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int
iconid, int state)
{
uiWidgetType *wt= widget_type(UI_WTYPE_MENU_ITEM);
rcti _rect= *rect;
@@ -3126,7 +3126,7 @@
}
}
-void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, char *name, int
iconid, int state)
+void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name,
int iconid, int state)
{
rcti trect = *rect;
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2011-02-07
21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2011-02-07
22:48:23 UTC (rev 34701)
@@ -550,7 +550,7 @@
return get_vert_def_nr(ob, def_nr, vertnum);
}
-void ED_vgroup_select_by_name(Object *ob, char *name)
+void ED_vgroup_select_by_name(Object *ob, const char *name)
{ /* note: ob->actdef==0 signals on painting to create a new one, if a
bone in posemode is selected */
ob->actdef= defgroup_name_index(ob, name) + 1;
}
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c
2011-02-07 21:57:40 UTC (rev 34700)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c
2011-02-07 22:48:23 UTC (rev 34701)
@@ -47,6 +47,7 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
+#include "BKE_action.h"
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_library.h"
@@ -1079,25 +1080,15 @@
"Invert the level (output) of this sensor");
}
-static void get_armature_bone_constraint(Object *ob, char *posechannel, char
*constraint_name, bConstraint **constraint)
+static void get_armature_bone_constraint(Object *ob, const char *posechannel,
const char *constraint_name, bConstraint **constraint)
{
/* check that bone exist in the active object */
if (ob->type == OB_ARMATURE && ob->pose) {
- bPoseChannel *pchan;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
