diff options
-rw-r--r-- | intern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/world.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_uvedit.h | 1 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_ops.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 66 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c | 2 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 10 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 1 |
14 files changed, 51 insertions, 56 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index de2c0ab9459..fe30d6cfa0c 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -58,4 +58,3 @@ endif() if(WITH_IK_ITASC) add_subdirectory(itasc) endif() - diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 1d6de41f9e8..9c455e84109 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -653,10 +653,6 @@ Material *give_node_material(Material *ma) return NULL; } -/*Image *give_mesh_face_image(Object *ob, int face) -{ -}*/ - /* GS reads the memory pointed at in a specific ordering. There are, * however two definitions for it. I have jotted them down here, both, * but I think the first one is actually used. The thing is that diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index cdee63172e5..eb6dcf8b462 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -860,7 +860,7 @@ Lamp *copy_lamp(Lamp *la) for(a=0; a<MAX_MTEX; a++) { if(lan->mtex[a]) { - lan->mtex[a]= MEM_mallocN(sizeof(MTex), "copy_lamp"); + lan->mtex[a]= MEM_mallocN(sizeof(MTex), "copylamptex"); memcpy(lan->mtex[a], la->mtex[a], sizeof(MTex)); id_us_plus((ID *)lan->mtex[a]->tex); } diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 32b4a84c237..7e2ed426e0a 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -137,7 +137,7 @@ World *copy_world(World *wrld) if(wrld->preview) wrldn->preview = BKE_previewimg_copy(wrld->preview); - + return wrldn; } diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index d4b98cc3697..1f77dba1b03 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -35,6 +35,7 @@ struct ARegionType; struct EditFace; struct Image; +struct Main; struct ImageUser; struct MTFace; struct Object; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 59a8a21ca4d..80a65d3224e 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -671,9 +671,9 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) /* test for collapsed areas. This could happen in some blender version... */ /* ton: removed option now, it needs Context... */ - /* make each window at least HEADERY high */ + /* make each window at least ED_area_headersize() high */ for(sa= sc->areabase.first; sa; sa= sa->next) { - int headery= HEADERY+1; + int headery= ED_area_headersize()+1; if(sa->v1->vec.y+headery > sa->v2->vec.y) { /* lower edge */ diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index c0702a6ba71..6a49fc2898b 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -195,5 +195,6 @@ void node_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "NODE_OT_read_fullsamplelayers", RKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "NODE_OT_render_changed", ZKEY, KM_PRESS, 0, 0); + transform_keymap_for_space(keyconf, keymap, SPACE_NODE); } diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 7fe6d24ceb8..f520ecfe277 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -131,7 +131,7 @@ static int draw_mesh_face_select__setHiddenOpts(void *userData, int index) MEdge *med = &me->medge[index]; uintptr_t flags = (intptr_t) BLI_edgehash_lookup(data->eh, med->v1, med->v2); - if(me->drawflag & ME_DRAWEDGES){ + if(me->drawflag & ME_DRAWEDGES) { if(me->drawflag & ME_HIDDENEDGES) return 1; else @@ -223,7 +223,7 @@ static int set_draw_settings_cached(int clearcache, int textured, MTFace *texfac static int c_litmatnr; static int c_badtex; - if(clearcache) { + if (clearcache) { c_textured= c_lit= c_doublesided= -1; c_texface= (MTFace*) -1; c_litob= (Object*) -1; @@ -231,7 +231,7 @@ static int set_draw_settings_cached(int clearcache, int textured, MTFace *texfac c_badtex= 0; } - if(texface) { + if (texface) { lit = lit && (lit==-1 || texface->mode&TF_LIGHT); textured = textured && (texface->mode&TF_TEX); doublesided = texface->mode&TF_TWOSIDE; @@ -239,15 +239,15 @@ static int set_draw_settings_cached(int clearcache, int textured, MTFace *texfac textured = 0; } - if(doublesided!=c_doublesided) { - if(doublesided) glDisable(GL_CULL_FACE); + if (doublesided!=c_doublesided) { + if (doublesided) glDisable(GL_CULL_FACE); else glEnable(GL_CULL_FACE); c_doublesided= doublesided; } - if(textured!=c_textured || texface!=c_texface) { - if(textured ) { + if (textured!=c_textured || texface!=c_texface) { + if (textured ) { c_badtex= !GPU_set_tpage(texface, !(litob->mode & OB_MODE_TEXTURE_PAINT)); } else { GPU_set_tpage(NULL, 0); @@ -257,9 +257,9 @@ static int set_draw_settings_cached(int clearcache, int textured, MTFace *texfac c_texface= texface; } - if(c_badtex) lit= 0; - if(lit!=c_lit || litob!=c_litob || litmatnr!=c_litmatnr) { - if(lit) { + if (c_badtex) lit= 0; + if (lit!=c_lit || litob!=c_litob || litmatnr!=c_litmatnr) { + if (lit) { Material *ma= give_current_material_or_def(litob, litmatnr+1); float spec[4]; @@ -353,16 +353,16 @@ static void draw_textured_end(void) static int draw_tface__set_draw_legacy(MTFace *tface, MCol *mcol, int matnr) { - if(tface && (tface->mode&TF_INVISIBLE)) return 0; + if (tface && (tface->mode&TF_INVISIBLE)) return 0; - if(tface && set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE)) { + if (tface && set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE)) { glColor3ub(0xFF, 0x00, 0xFF); return 2; /* Don't set color */ - } else if(tface && tface->mode&TF_OBCOL) { + } else if (tface && tface->mode&TF_OBCOL) { glColor3ubv(Gtexdraw.obcol); return 2; /* Don't set color */ - } else if(!mcol) { - if(tface) glColor3f(1.0, 1.0, 1.0); + } else if (!mcol) { + if (tface) glColor3f(1.0, 1.0, 1.0); else { Material *ma= give_current_material(Gtexdraw.ob, matnr+1); if(ma) { @@ -381,13 +381,13 @@ static int draw_tface__set_draw_legacy(MTFace *tface, MCol *mcol, int matnr) } static int draw_tface__set_draw(MTFace *tface, MCol *mcol, int matnr) { - if(tface && (tface->mode&TF_INVISIBLE)) return 0; + if (tface && (tface->mode&TF_INVISIBLE)) return 0; - if(tface && set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE)) { + if (tface && set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE)) { return 2; /* Don't set color */ - } else if(tface && tface->mode&TF_OBCOL) { + } else if (tface && tface->mode&TF_OBCOL) { return 2; /* Don't set color */ - } else if(!mcol) { + } else if (!mcol) { return 1; /* Don't set color */ } else { return 1; /* Set color from mcol */ @@ -405,7 +405,7 @@ static void add_tface_color_layer(DerivedMesh *dm) finalCol = MEM_mallocN(sizeof(MCol)*4*dm->getNumFaces(dm),"add_tface_color_layer"); for(i=0;i<dm->getNumFaces(dm);i++) { - if(tface && (tface->mode&TF_INVISIBLE)) { + if (tface && (tface->mode&TF_INVISIBLE)) { if( mcol ) memcpy(&finalCol[i*4],&mcol[i*4],sizeof(MCol)*4); else @@ -415,20 +415,20 @@ static void add_tface_color_layer(DerivedMesh *dm) finalCol[i*4+j].r = 255; } } - else if(tface && mface && set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, mface[i].mat_nr, TF_TWOSIDE)) { + else if (tface && mface && set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, mface[i].mat_nr, TF_TWOSIDE)) { for(j=0;j<4;j++) { finalCol[i*4+j].b = 255; finalCol[i*4+j].g = 0; finalCol[i*4+j].r = 255; } - } else if(tface && tface->mode&TF_OBCOL) { + } else if (tface && tface->mode&TF_OBCOL) { for(j=0;j<4;j++) { finalCol[i*4+j].r = FTOCHAR(Gtexdraw.obcol[0]); finalCol[i*4+j].g = FTOCHAR(Gtexdraw.obcol[1]); finalCol[i*4+j].b = FTOCHAR(Gtexdraw.obcol[2]); } - } else if(!mcol) { - if(tface) { + } else if (!mcol) { + if (tface) { for(j=0;j<4;j++) { finalCol[i*4+j].b = 255; finalCol[i*4+j].g = 255; @@ -474,7 +474,7 @@ static int draw_tface_mapped__set_draw(void *userData, int index) MFace *mface = &me->mface[index]; MCol *mcol = (me->mcol)? &me->mcol[index]: NULL; const int matnr = mface->mat_nr; - if(mface->flag & ME_HIDE) return 0; + if (mface->flag & ME_HIDE) return 0; return draw_tface__set_draw(tface, mcol, matnr); } @@ -486,7 +486,7 @@ static int draw_em_tf_mapped__set_draw(void *userData, int index) MCol *mcol; int matnr; - if(efa->h) + if (efa->h) return 0; tface = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE); @@ -500,7 +500,7 @@ static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmoot { Mesh *me = (Mesh*)userData; - if( (me->mface && me->mface[index].flag & ME_HIDE) || + if ( (me->mface && me->mface[index].flag & ME_HIDE) || (me->mtface && (me->mtface[index].mode & TF_INVISIBLE)) ) { return 0; @@ -539,7 +539,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) int matnr= mf->mat_nr; int mf_smooth= mf->flag & ME_SMOOTH; - if(!(mf->flag&ME_HIDE) && !(mode&TF_INVISIBLE) && (mode&TF_BMFONT)) { + if (!(mf->flag&ME_HIDE) && !(mode&TF_INVISIBLE) && (mode&TF_BMFONT)) { float v1[3], v2[3], v3[3], v4[3]; char string[MAX_PROPSTRING]; int characters, i, glattrib= -1, badtex= 0; @@ -556,8 +556,8 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) } else { badtex = set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE); - if(badtex) { - if(mcol) mcol+=4; + if (badtex) { + if (mcol) mcol+=4; continue; } } @@ -565,7 +565,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) ddm->getVertCo(ddm, mf->v1, v1); ddm->getVertCo(ddm, mf->v2, v2); ddm->getVertCo(ddm, mf->v3, v3); - if(mf->v4) ddm->getVertCo(ddm, mf->v4, v4); + if (mf->v4) ddm->getVertCo(ddm, mf->v4, v4); // The BM_FONT handling is in the gpu module, shared with the // game engine, was duplicated previously @@ -576,7 +576,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) if(!BKE_image_get_ibuf(tface->tpage, NULL)) characters = 0; - if(!mf_smooth) { + if (!mf_smooth) { float nor[3]; normal_tri_v3( nor,v1, v2, v3); @@ -587,7 +587,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) GPU_render_text(tface, tface->mode, string, characters, (unsigned int*)mcol, v1, v2, v3, (mf->v4? v4: NULL), glattrib); } - if(mcol) { + if (mcol) { mcol+=4; } } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index e427cf36627..56025b40648 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -630,7 +630,6 @@ static void view3d_recalc_used_layers(ARegion *ar, wmNotifier *wmn, Scene *scene static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn) { bScreen *sc; - RegionView3D *rv3d= ar->regiondata; /* context changes */ switch(wmn->category) { @@ -754,9 +753,10 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn) break; case NC_SPACE: if(wmn->data == ND_SPACE_VIEW3D) { - if (wmn->subtype == NS_VIEW3D_GPU) + if (wmn->subtype == NS_VIEW3D_GPU) { + RegionView3D *rv3d= ar->regiondata; rv3d->rflag |= RV3D_GPULIGHT_UPDATE; - + } ED_region_tag_redraw(ar); } break; diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index e91b9d892a5..4e4bb46669b 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -1361,11 +1361,6 @@ static void rna_property_update(bContext *C, Main *bmain, Scene *scene, PointerR else prop->update(bmain, scene, ptr); } - else if(!(prop->flag & PROP_BUILTIN)) { - DAG_id_tag_update(ptr->id.data, OB_RECALC_ALL); - WM_main_add_notifier(NC_WINDOW, NULL); - } - if(prop->noteflag) WM_main_add_notifier(prop->noteflag, ptr->id.data); } diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index be6f976495b..6c825b213b8 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -111,7 +111,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, +static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), struct EditMesh *UNUSED(editData), DerivedMesh *derivedData) { diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c b/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c index 5cfc1f59336..91fd995dbbe 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c @@ -95,3 +95,5 @@ void register_node_type_sh_hue_sat(ListBase *lb) nodeRegisterType(lb, &ntype); } + + diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index fab042d8e9e..418c1b68d28 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -118,13 +118,13 @@ set(SRC intern/raytrace/vbvh.h ) -IF(WITH_PYTHON) - ADD_DEFINITIONS(-DWITH_PYTHON) - LIST(APPEND INC ../python ${PYTHON_INC}) +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) + list(APPEND INC ../python ${PYTHON_INC}) endif() -IF(WITH_IMAGE_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) endif() if(WITH_MOD_SMOKE) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2bb710b9ad8..43fec85b5bf 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -231,6 +231,7 @@ else() set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}) endif() + # ----------------------------------------------------------------------------- # Install Targets |