Cleanup: warning, style
authorCampbell Barton <ideasman42@gmail.com>
Sun, 20 Sep 2015 20:59:50 +0000 (06:59 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 20 Sep 2015 20:59:50 +0000 (06:59 +1000)
release/datafiles/locale
release/scripts/addons
release/scripts/addons_contrib
source/blender/bmesh/intern/bmesh_queries.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_file/file_draw.c
source/blender/gpu/intern/gpu_extensions.c

index c651e63a9a537624f639950f3127a1dee29205d0..de6c83e12e75ffaac90eddbd3cb7451b57c2e0ce 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
+Subproject commit de6c83e12e75ffaac90eddbd3cb7451b57c2e0ce
index 4ac0fa2ac50863f4884b1ee0003a37c50fa93329..94c9c4ee3370d1feb42fc978a1f0d2db07cb9431 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4ac0fa2ac50863f4884b1ee0003a37c50fa93329
+Subproject commit 94c9c4ee3370d1feb42fc978a1f0d2db07cb9431
index cf842d8bb7b0033ca4fa99f7ebedcbd3810fd274..e31cec5bf243f00441c7dad7a775ec4722f829d3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit cf842d8bb7b0033ca4fa99f7ebedcbd3810fd274
+Subproject commit e31cec5bf243f00441c7dad7a775ec4722f829d3
index 09284ea35497c9e5c7bb1fcb23f0ec2ae90d5a0c..1a8ea1e3a0db090e4d7a0b9415c9893ba0c13fff 100644 (file)
@@ -317,7 +317,7 @@ float BM_loop_point_side_of_loop_test(const BMLoop *l, const float co[3])
  * Check if a point is inside the edge defined by a loop
  * (within the plane defined by the loops edge & face normal).
  *
- * \return signed, squared distablce to the edge plane, less than 0.0 when outside.
+ * \return signed, squared distance to the edge plane, less than 0.0 when outside.
  */
 float BM_loop_point_side_of_edge_test(const BMLoop *l, const float co[3])
 {
index 569d6116111f8030db9e36b6c25482dbb39a68df..1a1cc8894e631aad7fb7a345a1f8b0a808379646 100644 (file)
@@ -1562,8 +1562,8 @@ bool ED_screen_set(bContext *C, bScreen *sc)
                }
 
                /* Always do visible update since it's possible new screen will
-                * have different layers visible in 3D viewpots. This is possible
-                * because of view3d.lock_camera_and_layers option.
+                * have different layers visible in 3D view-ports.
+                * This is possible because of view3d.lock_camera_and_layers option.
                 */
                DAG_on_visible_update(bmain, false);
        }
index 7d68e782a89512f719682bd5b8b6ac8e0fc7d58c..2d9ecbdf4158cf9df69832ab71592db410e66c9c 100644 (file)
@@ -234,7 +234,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
                const struct FileDirEntry *file = sfile->files ? filelist_file(sfile->files, params->active_file) : NULL;
                char const *str_exec;
 
-               if (file && FILENAME_IS_PARENT(file->relpath)){
+               if (file && FILENAME_IS_PARENT(file->relpath)) {
                        str_exec = IFACE_("Parent Directory");
                }
                else if (file && file->typeflag & FILE_TYPE_DIR) {
index 33f0cb655a60444716a936f227b34c6daa914f4b..e30eeebf9347d37efa39ab65a65fba29dfbcb2ac 100644 (file)
@@ -1727,6 +1727,10 @@ GPUShader *GPU_shader_create_ex(const char *vertexcode,
        char standard_defines[MAX_DEFINE_LENGTH] = "";
        char standard_extensions[MAX_EXT_DEFINE_LENGTH] = "";
 
+#ifndef WITH_OPENSUBDIV
+       UNUSED_VARS(flags);
+#endif
+
        if (!GLEW_ARB_vertex_shader || !GLEW_ARB_fragment_shader || (geocode && !GPU_geometry_shader_support()))
                return NULL;