Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/drawarmature.c2
-rw-r--r--source/blender/editors/space_view3d/drawobject.c16
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_iterators.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c2
5 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 5863416f451..6c0bdc37797 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -271,7 +271,7 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
}
else {
if (bcolor) {
- char *cp = bcolor->solid;
+ const char *cp = bcolor->solid;
glColor4ub(cp[0], cp[1], cp[2], 204);
}
else
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 5acccb68bfb..6e8e1ffe114 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -157,8 +157,8 @@ typedef struct drawDMFacesSel_userData {
BMesh *bm;
BMFace *efa_act;
- int *orig_index_mf_to_mpoly;
- int *orig_index_mp_to_orig;
+ const int *orig_index_mf_to_mpoly;
+ const int *orig_index_mp_to_orig;
} drawDMFacesSel_userData;
typedef struct drawDMNormal_userData {
@@ -1883,7 +1883,7 @@ static void drawspeaker(Scene *UNUSED(scene), View3D *UNUSED(v3d), RegionView3D
static void lattice_draw_verts(Lattice *lt, DispList *dl, BPoint *actbp, short sel)
{
BPoint *bp = lt->def;
- float *co = dl ? dl->verts : NULL;
+ const float *co = dl ? dl->verts : NULL;
int u, v, w;
const int color = sel ? TH_VERTEX_SELECT : TH_VERTEX;
@@ -3863,7 +3863,7 @@ static bool drawDispListwire(ListBase *dlbase)
{
DispList *dl;
int parts, nr;
- float *data;
+ const float *data;
if (dlbase == NULL) return 1;
@@ -3957,8 +3957,8 @@ static void drawDispListsolid(ListBase *lb, Object *ob, const short dflag,
{
DispList *dl;
GPUVertexAttribs gattribs;
- float *data;
- float *ndata;
+ const float *data;
+ const float *ndata;
if (lb == NULL) return;
@@ -5428,7 +5428,7 @@ static void ob_draw_RE_motion(float com[3], float rotscale[3][3], float itw, flo
static void drawhandlesN(Nurb *nu, const char sel, const bool hide_handles)
{
BezTriple *bezt;
- float *fp;
+ const float *fp;
int a;
if (nu->hide || hide_handles) return;
@@ -5488,7 +5488,7 @@ static void drawhandlesN(Nurb *nu, const char sel, const bool hide_handles)
static void drawhandlesN_active(Nurb *nu)
{
BezTriple *bezt;
- float *fp;
+ const float *fp;
int a;
if (nu->hide) return;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 1a010bf77ff..429d9cc0a14 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -836,7 +836,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
const char *msg_sep = " : ";
char info[300];
- char *markern;
+ const char *markern;
char *s = info;
short offset = 1.5f * UI_UNIT_X + rect->xmin;
diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c
index 4df8010be9d..98d61c108a7 100644
--- a/source/blender/editors/space_view3d/view3d_iterators.c
+++ b/source/blender/editors/space_view3d/view3d_iterators.c
@@ -370,7 +370,7 @@ void lattice_foreachScreenVert(
Lattice *lt = obedit->data;
BPoint *bp = lt->editlatt->latt->def;
DispList *dl = obedit->curve_cache ? BKE_displist_find(&obedit->curve_cache->disp, DL_VERTS) : NULL;
- float *co = dl ? dl->verts : NULL;
+ const float *co = dl ? dl->verts : NULL;
int i, N = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
ED_view3d_check_mats_rv3d(vc->rv3d);
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 90a88567996..46a3a17747f 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1141,7 +1141,7 @@ static Base *object_mouse_select_menu(bContext *C, ViewContext *vc, unsigned int
for (node = linklist, i = 0; node; node = node->next, i++) {
Base *base = node->link;
Object *ob = base->object;
- char *name = ob->id.name + 2;
+ const char *name = ob->id.name + 2;
BLI_strncpy(object_mouse_select_menu_data[i].idname, name, MAX_ID_NAME - 2);
object_mouse_select_menu_data[i].icon = uiIconFromID(&ob->id);