replace strncpy with BLI_strncpy, in some cases strncpy was being misused since it doesnt ensure \0 termination.

also dont call CTX_data_scene() twice when checking for function arguments.

1 files changed, 27 insertions, 26 deletions

diff --git a/source/creator/creator.c b/source/creator/creator.c
index d25b0be30d8..3ce469de4e8 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -520,8 +520,8 @@ static int set_output(int argc, const char **argv, void *data)
 {
 	bContext *C = data;
 	if (argc >= 1){
-		if (CTX_data_scene(C)) {
-			Scene *scene= CTX_data_scene(C);
+		Scene *scene= CTX_data_scene(C);
+		if (scene) {
 			BLI_strncpy(scene->r.pic, argv[1], sizeof(scene->r.pic));
 		} else {
 			printf("\nError: no blend loaded. cannot use '-o / --render-output'.\n");
@@ -546,17 +546,17 @@ static int set_engine(int argc, const char **argv, void *data)
 			exit(0);
 		}
 		else {
-			if (CTX_data_scene(C)==NULL) {
-				printf("\nError: no blend loaded. order the arguments so '-E  / --engine ' is after a blend is loaded.\n");
-			}
-			else {
-				Scene *scene= CTX_data_scene(C);
+			Scene *scene= CTX_data_scene(C);
+			if (scene) {
 				RenderData *rd = &scene->r;
 
 				if(BLI_findstring(&R_engines, argv[1], offsetof(RenderEngineType, idname))) {
 					BLI_strncpy_utf8(rd->engine, argv[1], sizeof(rd->engine));
 				}
 			}
+			else {
+				printf("\nError: no blend loaded. order the arguments so '-E  / --engine ' is after a blend is loaded.\n");
+			}
 		}
 
 		return 1;
@@ -573,10 +573,8 @@ static int set_image_type(int argc, const char **argv, void *data)
 	bContext *C = data;
 	if (argc >= 1){
 		const char *imtype = argv[1];
-		if (CTX_data_scene(C)==NULL) {
-			printf("\nError: no blend loaded. order the arguments so '-F  / --render-format' is after the blend is loaded.\n");
-		} else {
-			Scene *scene= CTX_data_scene(C);
+		Scene *scene= CTX_data_scene(C);
+		if (scene) {
 			if      (!strcmp(imtype,"TGA")) scene->r.imtype = R_TARGA;
 			else if (!strcmp(imtype,"IRIS")) scene->r.imtype = R_IRIS;
 #ifdef WITH_DDS
@@ -612,6 +610,9 @@ static int set_image_type(int argc, const char **argv, void *data)
 #endif
 			else printf("\nError: Format from '-F / --render-format' not known or not compiled in this release.\n");
 		}
+		else {
+			printf("\nError: no blend loaded. order the arguments so '-F  / --render-format' is after the blend is loaded.\n");
+		}
 		return 1;
 	} else {
 		printf("\nError: you must specify a format after '-F  / --render-foramt'.\n");
@@ -638,8 +639,8 @@ static int set_extension(int argc, const char **argv, void *data)
 {
 	bContext *C = data;
 	if (argc >= 1) {
-		if (CTX_data_scene(C)) {
-			Scene *scene= CTX_data_scene(C);
+		Scene *scene= CTX_data_scene(C);
+		if (scene) {
 			if (argv[1][0] == '0') {
 				scene->r.scemode &= ~R_EXTENSION;
 			} else if (argv[1][0] == '1') {
@@ -721,9 +722,9 @@ example:
 static int render_frame(int argc, const char **argv, void *data)
 {
 	bContext *C = data;
-	if (CTX_data_scene(C)) {
+	Scene *scene= CTX_data_scene(C);
+	if (scene) {
 		Main *bmain= CTX_data_main(C);
-		Scene *scene= CTX_data_scene(C);
 
 		if (argc > 1) {
 			Render *re = RE_NewRender(scene->id.name);
@@ -763,9 +764,9 @@ static int render_frame(int argc, const char **argv, void *data)
 static int render_animation(int UNUSED(argc), const char **UNUSED(argv), void *data)
 {
 	bContext *C = data;
-	if (CTX_data_scene(C)) {
+	Scene *scene= CTX_data_scene(C);
+	if (scene) {
 		Main *bmain= CTX_data_main(C);
-		Scene *scene= CTX_data_scene(C);
 		Render *re= RE_NewRender(scene->id.name);
 		ReportList reports;
 		BKE_reports_init(&reports, RPT_PRINT);
@@ -782,9 +783,9 @@ static int set_scene(int argc, const char **argv, void *data)
 {
 	if(argc > 1) {
 		bContext *C= data;
-		Scene *sce= set_scene_name(CTX_data_main(C), argv[1]);
-		if(sce) {
-			CTX_data_scene_set(C, sce);
+		Scene *scene= set_scene_name(CTX_data_main(C), argv[1]);
+		if(scene) {
+			CTX_data_scene_set(C, scene);
 		}
 		return 1;
 	} else {
@@ -796,8 +797,8 @@ static int set_scene(int argc, const char **argv, void *data)
 static int set_start_frame(int argc, const char **argv, void *data)
 {
 	bContext *C = data;
-	if (CTX_data_scene(C)) {
-		Scene *scene= CTX_data_scene(C);
+	Scene *scene= CTX_data_scene(C);
+	if (scene) {
 		if (argc > 1) {
 			int frame = atoi(argv[1]);
 			(scene->r.sfra) = CLAMPIS(frame, MINFRAME, MAXFRAME);
@@ -815,8 +816,8 @@ static int set_start_frame(int argc, const char **argv, void *data)
 static int set_end_frame(int argc, const char **argv, void *data)
 {
 	bContext *C = data;
-	if (CTX_data_scene(C)) {
-		Scene *scene= CTX_data_scene(C);
+	Scene *scene= CTX_data_scene(C);
+	if (scene) {
 		if (argc > 1) {
 			int frame = atoi(argv[1]);
 			(scene->r.efra) = CLAMPIS(frame, MINFRAME, MAXFRAME);
@@ -834,8 +835,8 @@ static int set_end_frame(int argc, const char **argv, void *data)
 static int set_skip_frame(int argc, const char **argv, void *data)
 {
 	bContext *C = data;
-	if (CTX_data_scene(C)) {
-		Scene *scene= CTX_data_scene(C);
+	Scene *scene= CTX_data_scene(C);
+	if (scene) {
 		if (argc > 1) {
 			int frame = atoi(argv[1]);
 			(scene->r.frame_step) = CLAMPIS(frame, 1, MAXFRAME);