[Bf-blender-cvs] [00dd294a6ef] master: Cleanup: unused code

Campbell Barton noreply at git.blender.org
Thu Jan 17 02:37:56 CET 2019


Commit: 00dd294a6ef6398ed215c38bfe41c0aaa5ff0e09
Author: Campbell Barton
Date:   Thu Jan 17 11:17:45 2019 +1100
Branches: master
https://developer.blender.org/rB00dd294a6ef6398ed215c38bfe41c0aaa5ff0e09

Cleanup: unused code

===================================================================

M	source/blender/blenkernel/intern/softbody.c
M	source/blender/gpu/intern/gpu_draw.c

===================================================================

diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 3696431f7ff..f3f7eefc01c 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1503,16 +1503,6 @@ static void _scan_for_ext_spring_forces(Scene *scene, Object *ob, float timenow,
 	}
 }
 
-
-static void scan_for_ext_spring_forces(struct Depsgraph *depsgraph, Scene *scene, Object *ob, float timenow)
-{
-	SoftBody *sb = ob->soft;
-
-	ListBase *effectors = BKE_effectors_create(depsgraph, ob, NULL, sb->effector_weights);
-	_scan_for_ext_spring_forces(scene, ob, timenow, 0, sb->totspring, effectors);
-	BKE_effectors_free(effectors);
-}
-
 static void *exec_scan_for_ext_spring_forces(void *data)
 {
 	SB_thread_context *pctx = (SB_thread_context*)data;
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 7c06555f255..a9e11c50648 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -437,9 +437,6 @@ void GPU_create_gl_tex(
 {
 	ImBuf *ibuf = NULL;
 
-	int tpx = rectw;
-	int tpy = recth;
-
 	/* create image */
 	glGenTextures(1, (GLuint *)bind);
 	glBindTexture(textarget, *bind);



More information about the Bf-blender-cvs mailing list