diff options
| -rwxr-xr-x | build_files/cmake/cmake_consistency_check.py | 3 | ||||
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/nodes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/render/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 11 | ||||
| -rw-r--r-- | source/blender/nodes/CMakeLists.txt | 1 |
8 files changed, 20 insertions, 3 deletions
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index 6fdd178929b..be68455a113 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -93,6 +93,9 @@ def cmake_get_src(f): # print(f) def is_definition(l, f, i, name): + if l.startswith("unset("): + return False + if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)): if len(l.split()) > 1: raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i)) diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index e1fb44b92b4..17072d230bb 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -21,6 +21,7 @@ set(SRC set(SRC_HEADERS device.h + device_memory.h device_intern.h device_network.h ) diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index b010bba4d25..ae88008cf71 100644 --- a/intern/cycles/kernel/osl/CMakeLists.txt +++ b/intern/cycles/kernel/osl/CMakeLists.txt @@ -1,7 +1,7 @@ set(INC . - ../ + .. ../svm ../../render ../../util diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt index 389638b671b..1b8b81eb6f6 100644 --- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt +++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt @@ -50,6 +50,8 @@ set(SRC_OSL set(SRC_OSL_HEADERS node_texture.h + node_color.h + node_fresnel.h stdosl.h ) diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index 1dcd70bdf65..85552508bb9 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -16,6 +16,7 @@ set(SRC buffers.cpp camera.cpp film.cpp + # film_response.cpp # XXX, why isnt this in? filter.cpp graph.cpp image.cpp @@ -40,6 +41,7 @@ set(SRC_HEADERS buffers.h camera.h film.h + # film_response.h # XXX, why isnt this in? filter.h graph.h image.h diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index da183aaaeb2..76e948504eb 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -33,6 +33,7 @@ set(SRC_HEADERS util_cuda.h util_debug.h util_dynlib.h + util_foreach.h util_function.h util_hash.h util_image.h diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 4d024113cf8..04239ab9508 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -431,8 +431,9 @@ void vpaint_fill(Object *ob, unsigned int paintcol) me= get_mesh(ob); if(me==NULL || me->totface==0) return; - if(!me->mcol) - make_vertexcol(ob); + if(!me->mcol) make_vertexcol(ob); + if(!me->mcol) return; /* possible we can't make mcol's */ + selected= (me->editflag & ME_EDIT_PAINT_MASK); @@ -1758,8 +1759,14 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert if(dv_copy.dw) { MEM_freeN(dv_copy.dw); } +#if 0 /* dv may have been altered greatly */ dw = defvert_find_index(dv, vgroup); +#else + dw = NULL; /* UNUSED after assignment, set to NULL to ensuyre we don't + * use again, we thats needed un-ifdef the line above */ + (void)dw; /* quiet warnigns */ +#endif if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */ int index_mirr= mesh_get_x_mirror_vert(ob, index); diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 368ab1db50c..1b327edbc9f 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -131,6 +131,7 @@ set(SRC shader/nodes/node_shader_vectMath.c shader/nodes/node_shader_attribute.c shader/nodes/node_shader_background.c + # shader/nodes/node_shader_bsdf_anisotropic.c # XXX, why not included? shader/nodes/node_shader_bsdf_diffuse.c shader/nodes/node_shader_bsdf_glossy.c shader/nodes/node_shader_bsdf_glass.c |