diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 28238ad2eb5..e751d4a1e67 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -1386,7 +1386,6 @@ void set_displace_uvlayer(void *arg1, void *arg2) { DisplaceModifierData *dmd=arg1; CustomDataLayer *layer = arg2; - int i; /*check we have UV layers*/ if (stupid_uvmenu_var < 1) return; @@ -4885,7 +4884,7 @@ void weight_paint_buttons(uiBlock *block) if(ob){ uiBlockBeginAlign(block); - uiDefButBitS(block, TOG, VP_ONLYVGROUP, 0, "Vgroup", 10,0,75,19, &Gwp.flag, 0, 0, 0, 0, "Only paint on verteces in the selected vertex group."); + uiDefButBitS(block, TOG, VP_ONLYVGROUP, 0, "Vgroup", 10,0,75,19, &Gwp.flag, 0, 0, 0, 0, "Only paint on vertices in the selected vertex group."); uiDefButBitS(block, TOG, VP_MIRROR_X, REDRAWVIEW3D, "X-Mirror", 85,0,75,19, &Gwp.flag, 0, 0, 0, 0, "Mirrored Paint, applying on mirrored Weight Group name"); uiDefButBitC(block, TOG, OB_DRAWWIRE, REDRAWVIEW3D, "Wire", 160,0,75,19, &ob->dtx, 0, 0, 0, 0, "Displays the active object's wireframe in shaded drawing modes"); uiDefBut(block, BUT, B_CLR_WPAINT, "Clear", 235,0,75,19, NULL, 0, 0, 0, 0, "Removes reference to this deform group from all vertices"); diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 48f0f46128d..d23870f75e8 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -797,10 +797,15 @@ void objects_bake_render_menu(void) /* all selected meshes with UV maps are rendered for current scene visibility */ void objects_bake_render(short event) { - short prev_r_raytrace, prev_wo_amb_occ; + short prev_r_raytrace= 0, prev_wo_amb_occ= 0; if(event==0) event= G.scene->r.bake_mode; + if(G.scene->r.renderer!=R_INTERN) { + error("Bake only supported for Internal Renderer"); + return; + } + if(event>0) { Render *re= RE_NewRender("_Bake View_"); ScrArea *area= biggest_image_area(); diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c index b0559b8fbe7..97d47b079ca 100644 --- a/source/blender/src/sculptmode.c +++ b/source/blender/src/sculptmode.c @@ -1052,7 +1052,8 @@ float tex_strength(EditData *e, float *point, const float len,const unsigned vin else if(ss->texrndr) { const short bsize= sculptmode_brush()->size * 2; const short half= sculptmode_brush()->size; - const float rot= to_rad(*get_tex_angle()); + const float *ang= get_tex_angle(); + const float rot= ang?to_rad(*ang):0.0f; int px, py; unsigned i, *p; RenderInfo *ri= ss->texrndr; @@ -1512,8 +1513,9 @@ void sculptmode_propset_header() val= sculptmode_brush()->strength; } else if(pd->mode == PropsetTexRot) { + float *ang= get_tex_angle(); name= "Texture Angle"; - val= *get_tex_angle(); + val= ang?*get_tex_angle():0.0f; } sprintf(str, "Brush %s: %d", name, val); headerprint(str);